diff options
| author | Xinchen Hui <laruence@php.net> | 2014-01-03 11:09:07 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@php.net> | 2014-01-03 11:09:07 +0800 |
| commit | 0f53e37494e5cb280cb37c4ab15fe82e0c92a69e (patch) | |
| tree | 0a2d58a2239481f947326143f3e9ec289b5b5a43 /sapi/apache2filter | |
| parent | c9f909cd4297cee26c0033efaa31e45d6ec8d9f2 (diff) | |
| parent | c081ce628f0d76d44784d7bb8e06428b06142ac0 (diff) | |
| download | php-git-0f53e37494e5cb280cb37c4ab15fe82e0c92a69e.tar.gz | |
Merge branch 'PHP-5.6'
Diffstat (limited to 'sapi/apache2filter')
| -rw-r--r-- | sapi/apache2filter/apache_config.c | 2 | ||||
| -rw-r--r-- | sapi/apache2filter/php_apache.h | 2 | ||||
| -rw-r--r-- | sapi/apache2filter/php_functions.c | 2 | ||||
| -rw-r--r-- | sapi/apache2filter/sapi_apache2.c | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/sapi/apache2filter/apache_config.c b/sapi/apache2filter/apache_config.c index 333c7b8cf2..7c50b9e6a8 100644 --- a/sapi/apache2filter/apache_config.c +++ b/sapi/apache2filter/apache_config.c @@ -2,7 +2,7 @@ +----------------------------------------------------------------------+ | PHP Version 5 | +----------------------------------------------------------------------+ - | Copyright (c) 1997-2013 The PHP Group | + | Copyright (c) 1997-2014 The PHP Group | +----------------------------------------------------------------------+ | This source file is subject to version 3.01 of the PHP license, | | that is bundled with this package in the file LICENSE, and is | diff --git a/sapi/apache2filter/php_apache.h b/sapi/apache2filter/php_apache.h index 4ee3c0aa90..47fe98b5fd 100644 --- a/sapi/apache2filter/php_apache.h +++ b/sapi/apache2filter/php_apache.h @@ -2,7 +2,7 @@ +----------------------------------------------------------------------+ | PHP Version 5 | +----------------------------------------------------------------------+ - | Copyright (c) 1997-2013 The PHP Group | + | Copyright (c) 1997-2014 The PHP Group | +----------------------------------------------------------------------+ | This source file is subject to version 3.01 of the PHP license, | | that is bundled with this package in the file LICENSE, and is | diff --git a/sapi/apache2filter/php_functions.c b/sapi/apache2filter/php_functions.c index e96ceda3f1..f1ae9c974b 100644 --- a/sapi/apache2filter/php_functions.c +++ b/sapi/apache2filter/php_functions.c @@ -2,7 +2,7 @@ +----------------------------------------------------------------------+ | PHP Version 5 | +----------------------------------------------------------------------+ - | Copyright (c) 1997-2013 The PHP Group | + | Copyright (c) 1997-2014 The PHP Group | +----------------------------------------------------------------------+ | This source file is subject to version 3.01 of the PHP license, | | that is bundled with this package in the file LICENSE, and is | diff --git a/sapi/apache2filter/sapi_apache2.c b/sapi/apache2filter/sapi_apache2.c index c992c1c2d3..6b56e78545 100644 --- a/sapi/apache2filter/sapi_apache2.c +++ b/sapi/apache2filter/sapi_apache2.c @@ -2,7 +2,7 @@ +----------------------------------------------------------------------+ | PHP Version 5 | +----------------------------------------------------------------------+ - | Copyright (c) 1997-2013 The PHP Group | + | Copyright (c) 1997-2014 The PHP Group | +----------------------------------------------------------------------+ | This source file is subject to version 3.01 of the PHP license, | | that is bundled with this package in the file LICENSE, and is | |