diff options
| author | Pierre Joye <pierre.php@gmail.com> | 2014-03-05 10:37:04 +0100 |
|---|---|---|
| committer | Pierre Joye <pierre.php@gmail.com> | 2014-03-05 10:37:04 +0100 |
| commit | b084157d3d8972f8e5cb598f2b7fab5e7007bb92 (patch) | |
| tree | 555c6f3c9779bd3acf855e76219f50375ce11b5c /sapi/milter/php_milter.c | |
| parent | fb3e21fbcc4d723098052e779b444e7ee1d27ae2 (diff) | |
| parent | 014b95a0a7b638787aaa3d6ed864b6c3eaed3910 (diff) | |
| download | php-git-b084157d3d8972f8e5cb598f2b7fab5e7007bb92.tar.gz | |
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
# By Anatol Belski (38) and others
# Via Anatol Belski (23) and others
* 'PHP-5.5' of git.php.net:php-src: (325 commits)
NEWS
NEWS
Fixed Bug #66820 out-of-bounds memory access in fileinfo
Improves fix for memory leak, keep in sync with upstream.
Fixed news for #60602
Updated news for #60602
proc_open(): separate environment values that aren't strings
Fixed NEWS.
Updated news for #66535 and #66109
Updated NEWS for #66535
don't compare constants on run time
substr_compare(): Allow zero length comparison
Fixed test case title
[bug 66535] X-PHP-Originating-Script adds newline if no custom headers are given
Fixed expected output of a few cURL test cases
Allow NULL as value for CURLOPT_CUSTOMREQUEST option.
man page: long option name is --strip, not --stripped
--global have be removed in 5.2
typo spotted by Lajos Veres
update libs_version.txt
...
Diffstat (limited to 'sapi/milter/php_milter.c')
| -rw-r--r-- | sapi/milter/php_milter.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sapi/milter/php_milter.c b/sapi/milter/php_milter.c index 6856c07bb6..432fd806c2 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 | @@ -1109,7 +1109,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; |