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

diff --cc main/http_status_codes.h
index 4567fb4f3d55e9208c88408a8c8f20594e44b924,0000000000000000000000000000000000000000..987f2cf4c8ba2d936bbb09bc247c17c86a0455e5
mode 100644,000000..100644
--- 1/main/http_status_codes.h
--- /dev/null
+++ b/main/http_status_codes.h
@@@ -1,83 -1,0 +1,84 @@@
 +/*
 +   +----------------------------------------------------------------------+
 +   | PHP Version 7                                                        |
 +   +----------------------------------------------------------------------+
 +   | Copyright (c) 1997-2015 The PHP Group                                |
 +   +----------------------------------------------------------------------+
 +   | This source file is subject to version 3.01 of the PHP license,      |
 +   | that is bundled with this package in the file LICENSE, and is        |
 +   | available through the world-wide-web at the following url:           |
 +   | http://www.php.net/license/3_01.txt                                  |
 +   | If you did not receive a copy of the PHP license and are unable to   |
 +   | obtain it through the world-wide-web, please send a note to          |
 +   | license@php.net so we can mail you a copy immediately.               |
 +   +----------------------------------------------------------------------+
 +   | Author: Andrea Faulds     <ajf@ajf.me>                               |
 +   +----------------------------------------------------------------------+
 +*/
 +
 +/* $Id: $ */
 +
 +#ifndef HTTP_STATUS_CODES_H
 +#define HTTP_STATUS_CODES_H
 +
 +typedef struct _http_response_status_code_pair {
 +      const int code;
 +      const char *str;
 +} http_response_status_code_pair;
 +
 +static http_response_status_code_pair http_status_map[] = {
 +      { 100, "Continue" },
 +      { 101, "Switching Protocols" },
 +      { 200, "OK" },
 +      { 201, "Created" },
 +      { 202, "Accepted" },
 +      { 203, "Non-Authoritative Information" },
 +      { 204, "No Content" },
 +      { 205, "Reset Content" },
 +      { 206, "Partial Content" },
 +      { 300, "Multiple Choices" },
 +      { 301, "Moved Permanently" },
 +      { 302, "Found" },
 +      { 303, "See Other" },
 +      { 304, "Not Modified" },
 +      { 305, "Use Proxy" },
 +      { 307, "Temporary Redirect" },
 +      { 308, "Permanent Redirect" },
 +      { 400, "Bad Request" },
 +      { 401, "Unauthorized" },
 +      { 402, "Payment Required" },
 +      { 403, "Forbidden" },
 +      { 404, "Not Found" },
 +      { 405, "Method Not Allowed" },
 +      { 406, "Not Acceptable" },
 +      { 407, "Proxy Authentication Required" },
 +      { 408, "Request Timeout" },
 +      { 409, "Conflict" },
 +      { 410, "Gone" },
 +      { 411, "Length Required" },
 +      { 412, "Precondition Failed" },
 +      { 413, "Request Entity Too Large" },
 +      { 414, "Request-URI Too Long" },
 +      { 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" },
++      { 451, "Unavailable For Legal Reasons"},
 +      { 500, "Internal Server Error" },
 +      { 501, "Not Implemented" },
 +      { 502, "Bad Gateway" },
 +      { 503, "Service Unavailable" },
 +      { 504, "Gateway Timeout" },
 +      { 505, "HTTP Version Not Supported" },
 +      { 506, "Variant Also Negotiates" },
 +      { 511, "Network Authentication Required" },
 +      /* to allow search with while() loop */
 +      { 0, NULL }
 +};
 +
 +static const size_t http_status_map_len = (sizeof(http_status_map) / sizeof(http_response_status_code_pair)) - 1;
 +
 +#endif /* HTTP_STATUS_CODES_H */