diff options
| author | Adam Harvey <aharvey@php.net> | 2014-06-12 17:57:55 -0700 |
|---|---|---|
| committer | Adam Harvey <aharvey@php.net> | 2014-06-12 17:57:55 -0700 |
| commit | dd57ceb1dec8d48971be0e258c64cb905493e16b (patch) | |
| tree | 26e48804e874c5b11d88bb64f9c20d0d57a3d4d9 /sapi/cli/php_cli_server.c | |
| parent | a92e3eb0fec67d0606aa31a11996ee58f584a4ab (diff) | |
| parent | e082199d8ed1fec9ea69e2129ae08584ee3b66dd (diff) | |
| download | php-git-dd57ceb1dec8d48971be0e258c64cb905493e16b.tar.gz | |
Merge branch 'PHP-5.6'
* PHP-5.6:
Add 308 and 426 to the HTTP response code map in the CLI server.
Diffstat (limited to 'sapi/cli/php_cli_server.c')
| -rw-r--r-- | sapi/cli/php_cli_server.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sapi/cli/php_cli_server.c b/sapi/cli/php_cli_server.c index 0caa45c16c..60b331f386 100644 --- a/sapi/cli/php_cli_server.c +++ b/sapi/cli/php_cli_server.c @@ -220,6 +220,7 @@ static php_cli_server_http_response_status_code_pair status_map[] = { { 304, "Not Modified" }, { 305, "Use Proxy" }, { 307, "Temporary Redirect" }, + { 308, "Permanent Redirect" }, { 400, "Bad Request" }, { 401, "Unauthorized" }, { 402, "Payment Required" }, @@ -238,6 +239,7 @@ static php_cli_server_http_response_status_code_pair status_map[] = { { 415, "Unsupported Media Type" }, { 416, "Requested Range Not Satisfiable" }, { 417, "Expectation Failed" }, + { 426, "Upgrade Required" }, { 428, "Precondition Required" }, { 429, "Too Many Requests" }, { 431, "Request Header Fields Too Large" }, |