diff options
| author | Julien Pauli <jpauli@php.net> | 2015-12-23 11:33:10 +0100 |
|---|---|---|
| committer | Julien Pauli <jpauli@php.net> | 2015-12-23 11:36:36 +0100 |
| commit | b2ecac9250524c1de88ccf045e883d0b3f4bd32a (patch) | |
| tree | b5ba03e0bd95b51d2742e26295cf79e41a36c34f | |
| parent | f3bf95eb81a43e9e77277f5548687cdcc767a7ee (diff) | |
| parent | ea12ff149cdcfe04531c7114cf7a3b8e68cd074c (diff) | |
| download | php-git-b2ecac9250524c1de88ccf045e883d0b3f4bd32a.tar.gz | |
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
Added support for HTTP 451
Conflicts:
sapi/cgi/cgi_main.c
sapi/cli/php_cli_server.c
sapi/fpm/fpm/fpm_main.c
| -rw-r--r-- | main/http_status_codes.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/main/http_status_codes.h b/main/http_status_codes.h index 4567fb4f3d..987f2cf4c8 100644 --- a/main/http_status_codes.h +++ b/main/http_status_codes.h @@ -66,6 +66,7 @@ static http_response_status_code_pair http_status_map[] = { { 428, "Precondition Required" }, { 429, "Too Many Requests" }, { 431, "Request Header Fields Too Large" }, + { 451, "Unavailable For Legal Reasons"}, { 500, "Internal Server Error" }, { 501, "Not Implemented" }, { 502, "Bad Gateway" }, |