diff options
| author | Stanislav Malyshev <stas@php.net> | 2013-02-17 01:19:08 -0800 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2013-02-17 01:20:14 -0800 |
| commit | c877fcf6eca2a2836957a83539f6a8a4a1976ae2 (patch) | |
| tree | a73d56d137eae2e3f24d1f246f43771399af9209 | |
| parent | d3291de51a169b2141460ff2e432774fe84cc90e (diff) | |
| parent | 59b016192dd52f40591ad969e1ce7c1bfcb947a3 (diff) | |
| download | php-git-c877fcf6eca2a2836957a83539f6a8a4a1976ae2.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Added HTTP codes as of RFC 6585
| -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 ?? ??? 201?, PHP 5.5.0 Beta 1 - Core: + . Implemented FR #64175 (Added HTTP codes as of RFC 6585). (Jonh Wendell) . Fixed bug #64135 (Exceptions from set_error_handler are not always propagated). (Laruence) . Fixed bug #63830 (Segfault on undefined function call in nested generator). diff --git a/sapi/cgi/cgi_main.c b/sapi/cgi/cgi_main.c index fbb9f512d0..9e6b74ac61 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 566ea6d32a..1d2ceff691 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} }; |