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.

diff --cc NEWS
index 6d7a7e69599e2476d2ae0221bff6909efc8e9aba,83428f0f3a007f61b06eb7f65447fb0c4efcc440..79d65010f6fc3d5f2f72426011c5c9491c3cbb9c
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -6,7 -6,11 +6,11 @@@ PH
    . Fixed bug #67428 (header('Location: foo') will override a 308-399 response
      code). (Adam)
  
 -?? ??? 2014, PHP 5.4.30
+ - CLI server:
+   . Implemented FR #67429 (CLI server is missing some new HTTP response codes).
+     (Adam)
+ 
 +?? ??? 2014, PHP 5.5.14
  
  - Core:
    . Fixed BC break introduced by patch for bug #67072. (Anatol)

diff --cc sapi/cli/php_cli_server.c
Simple merge