com php-src: Merge branch 'PHP-5.4' into PHP-5.5: NEWS sapi/cli/php_cli_server.c
| From: | Adam Harvey | Date: | Fri, 13 Jun 2014 00:56:10 +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-78862@lists.php.net to get a copy of this message | ||
Commit: e956ba935765c410195a3d402aa9456d187472d6
Author: Adam Harvey <aharvey@php.net> Thu, 12 Jun 2014 17:56:10 -0700
Parents: aa3a5f7681060b9fe7839479d4b4355ccaa10e5e fe676748091e3329a8c8b053b7ce6fd41ae264e6
Branches: PHP-5.5 PHP-5.6 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=e956ba935765c410195a3d402aa9456d187472d6
Log:
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Add 308 and 426 to the HTTP response code map in the CLI server.
Changed paths:
MM NEWS
MM sapi/cli/php_cli_server.c
Diff:
diff --cc NEWS
index 6d7a7e6,83428f0..79d6501
--- a/NEWS
+++ b/NEWS
@@@ -6,7 -6,11 +6,11 @@@ PH
. Fixed bug #67428 (header('Location: foo') will override a 308-399 response
code). (Adam)
+ - CLI server:
+ . Implemented FR #67429 (CLI server is missing some new HTTP response codes).
+ (Adam)
+
-?? ??? 2014, PHP 5.4.30
+?? ??? 2014, PHP 5.5.14
- Core:
. Fixed BC break introduced by patch for bug #67072. (Anatol)