httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j..@apache.org
Subject svn commit: r572632 - in /httpd/httpd/branches/2.2.x: CHANGES STATUS modules/generators/mod_info.c
Date Tue, 04 Sep 2007 11:48:57 GMT
Author: jim
Date: Tue Sep  4 04:48:57 2007
New Revision: 572632

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

PR 42847.

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/generators/mod_info.c

Modified: httpd/httpd/branches/2.2.x/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/CHANGES?rev=572632&r1=572631&r2=572632&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/CHANGES [utf-8] (original)
+++ httpd/httpd/branches/2.2.x/CHANGES [utf-8] Tue Sep  4 04:48:57 2007
@@ -1,6 +1,9 @@
                                                         -*- coding: utf-8 -*-
 Changes with Apache 2.2.6
 
+  *) mod_info: mod_info outputs invalid XHTML 1.0 transitional.
+     PR 42847 [Rici Lake <rici ricilake.net>]
+
   *) mod_ssl: Fix spurious hostname mismatch warning for valid
      wildcard certificates.  PR 37911.  [Nick Burch <nick torchbox.com>]
 

Modified: httpd/httpd/branches/2.2.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/STATUS?rev=572632&r1=572631&r2=572632&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/STATUS (original)
+++ httpd/httpd/branches/2.2.x/STATUS Tue Sep  4 04:48:57 2007
@@ -80,15 +80,6 @@
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
 
-    * mod_info: mod_info outputs invalid XHTML 1.0 Transitional.
-      PR 42847.
-      Trunk version of patch:
-         http://svn.apache.org/viewcvs.cgi?rev=562503&view=rev
-      Backport version for 2.2.x of patch:
-         Trunk version of patch works
-      +1: rpluem, fielding, jim
-
-
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
 
    * mod_authn_dbd: Export any additional columns queried in the SQL select

Modified: httpd/httpd/branches/2.2.x/modules/generators/mod_info.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/modules/generators/mod_info.c?rev=572632&r1=572631&r2=572632&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/modules/generators/mod_info.c (original)
+++ httpd/httpd/branches/2.2.x/modules/generators/mod_info.c Tue Sep  4 04:48:57 2007
@@ -721,7 +721,7 @@
                                            ap_escape_html(r->pool, cmd->name),
                                            cmd->name[0] == '<' ? "&gt;" : "");
                                 if (cmd->errmsg) {
-                                    ap_rputs(cmd->errmsg, r);
+                                    ap_rputs(ap_escape_html(r->pool, cmd->errmsg),
r);
                                 }
                                 ap_rputs("</i></tt></dd>\n", r);
                             }



Mime
View raw message