summaryrefslogtreecommitdiff
path: root/sapi/milter/php_milter.c
diff options
context:
space:
mode:
authorXinchen Hui <laruence@php.net>2014-01-03 11:09:07 +0800
committerXinchen Hui <laruence@php.net>2014-01-03 11:09:07 +0800
commit0f53e37494e5cb280cb37c4ab15fe82e0c92a69e (patch)
tree0a2d58a2239481f947326143f3e9ec289b5b5a43 /sapi/milter/php_milter.c
parentc9f909cd4297cee26c0033efaa31e45d6ec8d9f2 (diff)
parentc081ce628f0d76d44784d7bb8e06428b06142ac0 (diff)
downloadphp-git-0f53e37494e5cb280cb37c4ab15fe82e0c92a69e.tar.gz
Merge branch 'PHP-5.6'
Diffstat (limited to 'sapi/milter/php_milter.c')
-rw-r--r--sapi/milter/php_milter.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sapi/milter/php_milter.c b/sapi/milter/php_milter.c
index f0ce1b02f7..e0b2d0a0af 100644
--- a/sapi/milter/php_milter.c
+++ b/sapi/milter/php_milter.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 |
@@ -1105,7 +1105,7 @@ int main(int argc, char *argv[])
}
SG(headers_sent) = 1;
SG(request_info).no_headers = 1;
- php_printf("PHP %s (%s) (built: %s %s)\nCopyright (c) 1997-2013 The PHP Group\n%s", PHP_VERSION, sapi_module.name, __DATE__, __TIME__, get_zend_version());
+ php_printf("PHP %s (%s) (built: %s %s)\nCopyright (c) 1997-2014 The PHP Group\n%s", PHP_VERSION, sapi_module.name, __DATE__, __TIME__, get_zend_version());
php_output_teardown();
exit(1);
break;