diff options
| author | Jeff Trawick <trawick@apache.org> | 2007-12-15 13:27:55 +0000 |
|---|---|---|
| committer | Jeff Trawick <trawick@apache.org> | 2007-12-15 13:27:55 +0000 |
| commit | da9bb4ee99c9760ba8d696ff3e789d46a24d4aab (patch) | |
| tree | 7a2632b6c46d0fde04f5f4adce91e00384366c47 | |
| parent | 2735d2ec8564c56d999e166717b842201afea97f (diff) | |
| download | httpd-da9bb4ee99c9760ba8d696ff3e789d46a24d4aab.tar.gz | |
merge r600645 from trunk:
http_protocol: Escape request method in 413 error reporting.
Determined to be not generally exploitable, but a flaw in any case.
PR 44014
Submitted by: Victor Stinner <victor.stinner inl.fr>
Reviewed by: wrowe, rpluem, trawick
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.0.x@604425 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | CHANGES | 4 | ||||
| -rw-r--r-- | STATUS | 6 | ||||
| -rw-r--r-- | modules/http/http_protocol.c | 4 |
3 files changed, 6 insertions, 8 deletions
@@ -1,6 +1,10 @@ -*- coding: utf-8 -*- Changes with Apache 2.0.62 + *) http_protocol: Escape request method in 413 error reporting. + Determined to be not generally exploitable, but a flaw in any case. + PR 44014 [Victor Stinner <victor.stinner inl.fr>] + *) SECURITY: CVE-2007-5000 (cve.mitre.org) mod_imagemap: Fix a cross-site scripting issue. Reported by JPCERT. [Joe Orton] @@ -129,12 +129,6 @@ RELEASE SHOWSTOPPERS: PATCHES ACCEPTED TO BACKPORT FROM TRUNK: [ start all new proposals below, under PATCHES PROPOSED. ] - * http_protocol: Escape request method in 413 error reporting. - Determined to be not generally exploitable, but a flaw in any case. - PR 44014 [Victor Stinner <victor.stinner inl.fr>] - http://svn.apache.org/viewvc?view=rev&rev=600645 - +1: wrowe, rpluem, trawick - * http_protocol: Escape request method in 405 error reporting. Trunk: http://svn.apache.org/viewvc?view=rev&revision=603346 diff --git a/modules/http/http_protocol.c b/modules/http/http_protocol.c index d773045c22..d521842b7b 100644 --- a/modules/http/http_protocol.c +++ b/modules/http/http_protocol.c @@ -2200,7 +2200,7 @@ static const char *get_canned_error_string(int status, case HTTP_LENGTH_REQUIRED: s1 = apr_pstrcat(p, "<p>A request of the requested method ", - r->method, + ap_escape_html(r->pool, r->method), " requires a valid Content-length.<br />\n", NULL); return(add_optional_notes(r, s1, "error-notes", "</p>\n")); @@ -2247,7 +2247,7 @@ static const char *get_canned_error_string(int status, "The requested resource<br />", ap_escape_html(r->pool, r->uri), "<br />\n", "does not allow request data with ", - r->method, + ap_escape_html(r->pool, r->method), " requests, or the amount of data provided in\n" "the request exceeds the capacity limit.\n", NULL)); |