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.
This commit is contained in:
Adam Harvey 2014-06-12 17:57:36 -07:00
commit e082199d8e
3 changed files with 55 additions and 0 deletions

View file

@ -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" },