httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j..@apache.org
Subject svn commit: r574943 - in /httpd/httpd/branches/2.2.x: CHANGES STATUS modules/proxy/proxy_util.c
Date Wed, 12 Sep 2007 13:18:38 GMT
Author: jim
Date: Wed Sep 12 06:18:32 2007
New Revision: 574943

URL: http://svn.apache.org/viewvc?rev=574943&view=rev
Log:
Merge r573939 from trunk:

Escape error-notes correctly
PR 40952

Submitted by: niq
Reviewed by: jim

Modified:
    httpd/httpd/branches/2.2.x/CHANGES
    httpd/httpd/branches/2.2.x/STATUS
    httpd/httpd/branches/2.2.x/modules/proxy/proxy_util.c

Modified: httpd/httpd/branches/2.2.x/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/CHANGES?rev=574943&r1=574942&r2=574943&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/CHANGES [utf-8] (original)
+++ httpd/httpd/branches/2.2.x/CHANGES [utf-8] Wed Sep 12 06:18:32 2007
@@ -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>]
 

Modified: httpd/httpd/branches/2.2.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/STATUS?rev=574943&r1=574942&r2=574943&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/STATUS (original)
+++ httpd/httpd/branches/2.2.x/STATUS Wed Sep 12 06:18:32 2007
@@ -89,11 +89,6 @@
       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 

Modified: httpd/httpd/branches/2.2.x/modules/proxy/proxy_util.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/modules/proxy/proxy_util.c?rev=574943&r1=574942&r2=574943&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/modules/proxy/proxy_util.c (original)
+++ httpd/httpd/branches/2.2.x/modules/proxy/proxy_util.c Wed Sep 12 06:18:32 2007
@@ -495,7 +495,7 @@
     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"



Mime
View raw message