com php-src: Merge branch 'PHP-5.4' into PHP-5.5: NEWS sapi/cli/php_cli_server.c
| From: | Adam Harvey | Date: | Mon, 09 Sep 2013 23:32:16 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.4' into PHP-5.5: NEWS sapi/cli/php_cli_server.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-73167@lists.php.net to get a copy of this message | ||
Commit: 8b6270271ea0b707c69c80d7c41886b125af925c
Author: Adam Harvey <aharvey@php.net> Mon, 9 Sep 2013 16:32:16 -0700
Parents: b54b6e30a4e46d9dd1f1bf0cbc0d4539c0f7d51d 3c3b2b5bdc8e2bcff4d0e7d09375ad7af760b32a
Branches: PHP-5.5 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=8b6270271ea0b707c69c80d7c41886b125af925c
Log:
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Handle CLI server request headers case insensitively.
5.4.21 now
Conflicts:
configure.in
main/php_version.h
Changed paths:
MM NEWS
MM sapi/cli/php_cli_server.c
Diff:
diff --cc NEWS
index 8655571,e05b240..73214b3
--- a/NEWS
+++ b/NEWS
@@@ -1,8 -1,12 +1,12 @@@
PHP NEWS
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-?? ??? 2013, PHP 5.4.21
+?? ??? 2013, PHP 5.5.5
+ - CLI server:
+ . Fixed bug #65633 (built-in server treat some http headers as
+ case-sensitive). (Adam)
+
-?? ??? 2013, PHP 5.4.20
+?? ??? 2013, PHP 5.5.4
- Core:
. Fixed bug #60598 (cli/apache sapi segfault on objects manipulation).