diff options
| author | Jonh Wendell <jonh.wendell@oiwifi.com.br> | 2013-02-08 14:09:11 -0200 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2013-02-17 01:18:40 -0800 |
| commit | 59b016192dd52f40591ad969e1ce7c1bfcb947a3 (patch) | |
| tree | 99d32b0318b68dc2c559a6be54c6a311f35dddd7 | |
| parent | 263accb626759c92510817cd565885106aa07f4d (diff) | |
| download | php-git-59b016192dd52f40591ad969e1ce7c1bfcb947a3.tar.gz | |
Added HTTP codes as of RFC 6585
Added descriptions for the new HTTP codes:
- 428 Precondition Required
- 429 Too Many Requests
- 431 Request Header Fields Too Large
- 511 Network Authentication Required
| -rw-r--r-- | NEWS | 1 | ||||
| -rw-r--r-- | sapi/cgi/cgi_main.c | 4 | ||||
| -rw-r--r-- | sapi/cli/php_cli_server.c | 4 | ||||
| -rw-r--r-- | sapi/fpm/fpm/fpm_main.c | 4 |
4 files changed, 13 insertions, 0 deletions
@@ -3,6 +3,7 @@ PHP NEWS ?? ??? 2012, PHP 5.4.13 - Core: + . Implemented FR #64175 (Added HTTP codes as of RFC 6585). (Jonh Wendell) . Fixed bug #64142 (dval to lval different behavior on ppc64). (Remi) - CLI server: diff --git a/sapi/cgi/cgi_main.c b/sapi/cgi/cgi_main.c index 35402a47d9..c8dfec0f95 100644 --- a/sapi/cgi/cgi_main.c +++ b/sapi/cgi/cgi_main.c @@ -384,12 +384,16 @@ static const http_error http_error_codes[] = { {413, "Request Entity Too Large"}, {414, "Request-URI Too Large"}, {415, "Unsupported Media Type"}, + {428, "Precondition Required"}, + {429, "Too Many Requests"}, + {431, "Request Header Fields Too Large"}, {500, "Internal Server Error"}, {501, "Not Implemented"}, {502, "Bad Gateway"}, {503, "Service Unavailable"}, {504, "Gateway Time-out"}, {505, "HTTP Version not supported"}, + {511, "Network Authentication Required"}, {0, NULL} }; diff --git a/sapi/cli/php_cli_server.c b/sapi/cli/php_cli_server.c index 6a4e7c53ab..ab7f4cfd19 100644 --- a/sapi/cli/php_cli_server.c +++ b/sapi/cli/php_cli_server.c @@ -236,12 +236,16 @@ static php_cli_server_http_reponse_status_code_pair status_map[] = { { 415, "Unsupported Media Type" }, { 416, "Requested Range Not Satisfiable" }, { 417, "Expectation Failed" }, + { 428, "Precondition Required" }, + { 429, "Too Many Requests" }, + { 431, "Request Header Fields Too Large" }, { 500, "Internal Server Error" }, { 501, "Not Implemented" }, { 502, "Bad Gateway" }, { 503, "Service Unavailable" }, { 504, "Gateway Timeout" }, { 505, "HTTP Version Not Supported" }, + { 511, "Network Authentication Required" }, }; static php_cli_server_http_reponse_status_code_pair template_map[] = { diff --git a/sapi/fpm/fpm/fpm_main.c b/sapi/fpm/fpm/fpm_main.c index 40810f00bb..61088c465b 100644 --- a/sapi/fpm/fpm/fpm_main.c +++ b/sapi/fpm/fpm/fpm_main.c @@ -375,12 +375,16 @@ static const http_error http_error_codes[] = { {413, "Request Entity Too Large"}, {414, "Request-URI Too Large"}, {415, "Unsupported Media Type"}, + {428, "Precondition Required"}, + {429, "Too Many Requests"}, + {431, "Request Header Fields Too Large"}, {500, "Internal Server Error"}, {501, "Not Implemented"}, {502, "Bad Gateway"}, {503, "Service Unavailable"}, {504, "Gateway Time-out"}, {505, "HTTP Version not supported"}, + {511, "Network Authentication Required"}, {0, NULL} }; |