diff options
author | Jim Jagielski <jim@apache.org> | 2016-06-13 13:00:34 +0000 |
---|---|---|
committer | Jim Jagielski <jim@apache.org> | 2016-06-13 13:00:34 +0000 |
commit | 78309494d54a1490c8e125c3b012d5e4bf0db0ae (patch) | |
tree | 8b23189b8b5a06cf9ec55d8b9ddcadbceb347583 /modules/http/http_protocol.c | |
parent | 7ab82024407189d6294046e88fc7f480ad95d88d (diff) | |
download | httpd-78309494d54a1490c8e125c3b012d5e4bf0db0ae.tar.gz |
Merge r1730723 from trunk:
Add 451... Needed to adjust RESPONSE_CODES which
was not in the provided patch
BUGZ# 58985
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1748212 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'modules/http/http_protocol.c')
-rw-r--r-- | modules/http/http_protocol.c | 28 |
1 files changed, 27 insertions, 1 deletions
diff --git a/modules/http/http_protocol.c b/modules/http/http_protocol.c index 9aa0549b11..582d87e3b0 100644 --- a/modules/http/http_protocol.c +++ b/modules/http/http_protocol.c @@ -146,7 +146,27 @@ static const char * const status_lines[RESPONSE_CODES] = "429 Too Many Requests", NULL, /* 430 */ "431 Request Header Fields Too Large", -#define LEVEL_500 71 + NULL, /* 432 */ + NULL, /* 433 */ + NULL, /* 434 */ + NULL, /* 435 */ + NULL, /* 436 */ + NULL, /* 437 */ + NULL, /* 438 */ + NULL, /* 439 */ + NULL, /* 440 */ + NULL, /* 441 */ + NULL, /* 442 */ + NULL, /* 443 */ + NULL, /* 444 */ + NULL, /* 445 */ + NULL, /* 446 */ + NULL, /* 447 */ + NULL, /* 448 */ + NULL, /* 449 */ + NULL, /* 450 */ + "451 Unavailable For Legal Reasons", +#define LEVEL_500 91 "500 Internal Server Error", "501 Not Implemented", "502 Bad Gateway", @@ -1298,6 +1318,12 @@ static const char *get_canned_error_string(int status, "request as the requested host name does not match\n" "the Server Name Indication (SNI) in use for this\n" "connection.</p>\n"); + case HTTP_UNAVAILABLE_FOR_LEGAL_REASONS: + s1 = apr_pstrcat(p, + "<p>Access to ", ap_escape_html(r->pool, r->uri), + "\nhas been denied for legal reasons.<br />\n", + NULL); + return(add_optional_notes(r, s1, "error-notes", "</p>\n")); default: /* HTTP_INTERNAL_SERVER_ERROR */ /* * This comparison to expose error-notes could be modified to |