diff options
| author | krakjoe <joe.watkins@live.co.uk> | 2014-02-02 13:42:01 +0000 |
|---|---|---|
| committer | krakjoe <joe.watkins@live.co.uk> | 2014-02-02 13:42:01 +0000 |
| commit | a4a120d66aaf44cd0dc71f39a49998b924c2ef0e (patch) | |
| tree | f48300cf85374f82a437a42f3a2d4ed88867f34d /sapi/milter/php_milter.c | |
| parent | 8a7e2f8dd2116ff6ada654e301c593accf337250 (diff) | |
| parent | 05c309f2d85bcc33e95415d7f50d7748a7c27498 (diff) | |
| download | php-git-a4a120d66aaf44cd0dc71f39a49998b924c2ef0e.tar.gz | |
Merge branch 'PHP-5.6' of https://git.php.net/repository/php-src into PHP-5.6
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; |