diff options
| author | Adam Harvey <aharvey@php.net> | 2014-06-12 17:57:36 -0700 |
|---|---|---|
| committer | Adam Harvey <aharvey@php.net> | 2014-06-12 17:57:36 -0700 |
| commit | e082199d8ed1fec9ea69e2129ae08584ee3b66dd (patch) | |
| tree | 91e3a9d047a62a753277ebc2c6b5d24f266a1862 /sapi/cli/php_cli_server.c | |
| parent | 82231b5d895b67652c14ecb0ffddc8239777c175 (diff) | |
| parent | e956ba935765c410195a3d402aa9456d187472d6 (diff) | |
| download | php-git-e082199d8ed1fec9ea69e2129ae08584ee3b66dd.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
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 39c3108bc7..64cca0eb6f 100644 --- a/sapi/cli/php_cli_server.c +++ b/sapi/cli/php_cli_server.c @@ -223,6 +223,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" }, @@ -241,6 +242,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" }, |