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.

1 files changed, 49 insertions, 0 deletions

diff --git a/sapi/cli/tests/bug67429.phpt b/sapi/cli/tests/bug67429.phpt
new file mode 100644
index 0000000000..59486dbc0e
--- /dev/null
+++ b/sapi/cli/tests/bug67429.phpt
@@ -0,0 +1,49 @@
+--TEST--
+FR #67429 (CLI server is missing some new HTTP response codes)
+--SKIPIF--
+<?php
+include "skipif.inc";
+?>
+--FILE--
+<?php
+include "php_cli_server.inc";
+
+foreach ([308, 426] as $code) {
+  php_cli_server_start(<<<PHP
+http_response_code($code);
+PHP
+  );
+
+  list($host, $port) = explode(':', PHP_CLI_SERVER_ADDRESS);
+  $port = intval($port)?:80;
+
+  $fp = fsockopen($host, $port, $errno, $errstr, 0.5);
+  if (!$fp) {
+    die("connect failed");
+  }
+
+  if(fwrite($fp, <<<HEADER
+GET / HTTP/1.1
+
+
+HEADER
+  )) {
+      while (!feof($fp)) {
+          echo fgets($fp);
+      }
+  }
+
+  fclose($fp);
+}
+?>
+--EXPECTF--
+HTTP/1.1 308 Permanent Redirect
+Connection: close
+X-Powered-By: %s
+Content-type: text/html
+
+HTTP/1.1 426 Upgrade Required
+Connection: close
+X-Powered-By: %s
+Content-type: text/html
+