From: Nick Kew <niq@apache.org>
Date: Sun, 9 Sep 2007 01:13:38 +0000 (+0000)
Subject: Escape error-notes correctly
X-Git-Tag: 2.3.0~1441
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=982a8e3feb23b8a4b46a7b7ad29ba925c758f2c6;p=apache

Escape error-notes correctly
PR 40952


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@573939 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/CHANGES b/CHANGES
index 7c1a1d0f0c..8f41c840e1 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,9 @@
 Changes with Apache 2.3.0
 [ When backported to 2.2.x, remove entry from this file ]
 
+  *) 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/modules/proxy/proxy_util.c b/modules/proxy/proxy_util.c
index 17085ac5c5..a9434b450f 100644
--- a/modules/proxy/proxy_util.c
+++ b/modules/proxy/proxy_util.c
@@ -494,7 +494,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"