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
This commit is contained in:
Julien Pauli 2015-12-23 11:33:10 +01:00
commit b2ecac9250

View file

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