Merge r573939 from trunk:

Escape error-notes correctly
PR 40952

Submitted by: niq
Reviewed by: jim

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@574943 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/CHANGES b/CHANGES
index a7fe2e119bf41bc8c8489761f717300acbee9f40..ccc8919b6118953b1eb52abbe0ef10b0dd1f6092 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,9 @@
                                                         -*- coding: utf-8 -*-
 Changes with Apache 2.2.7
 
+  *) mod_proxy: escape error-notes correctly
+     PR 40952 [Thijs Kinkhorst <thijs debian.org>]
+
   *) mod_proxy: check ProxyBlock for all blocked addresses
      PR 36987 [Timo Viipuri <timo.viipuri f-secure.com>]
 

diff --git a/STATUS b/STATUS
index 25269a47007c300a3286fc50bedf3cfca8b5d59c..983c9aea79e0372820a5205b8eda3ca2d4ef5873 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -89,11 +89,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
       http://svn.apache.org/viewvc?view=rev&revision=574100
       +1: niq, rpluem, jim
 
-    * mod_proxy: escape error-notes correctly
-      PR 40952
-      http://svn.apache.org/viewvc?view=rev&revision=573939
-      +1: niq, rpluem, jim
-
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
 
     * mpm_winnt: Eliminate wait_for_many_objects.  Allows the clean 

diff --git a/modules/proxy/proxy_util.c b/modules/proxy/proxy_util.c
index d0ac438decc9e4162f48fd911a9805c299ddf63b..26fa308e0fb79ab6062a5bd30ef955dd2610480b 100644 (file)
--- a/modules/proxy/proxy_util.c
+++ b/modules/proxy/proxy_util.c
@@ -495,7 +495,7 @@ PROXY_DECLARE(int) ap_proxyerror(request_rec *r, int statuscode, const char *mes
     apr_table_setn(r->notes, "error-notes",
     apr_pstrcat(r->pool,
         "The proxy server could not handle the request "
-        "<em><a href=\"", ap_escape_uri(r->pool, r->uri),
+        "<em><a href=\"", ap_escape_html(r->pool, r->uri),
         "\">", ap_escape_html(r->pool, r->method),
         "&nbsp;",
         ap_escape_html(r->pool, r->uri), "</a></em>.<p>\n"