Merge r562503 from trunk:

PR 42847.

Reviewed by: jim

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

diff --git a/CHANGES b/CHANGES
index b4b9de0496247defbcd8f0869be6062df185b00d..47a2873565e8460273492d7c2180e92a1bddf205 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -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>]
 

diff --git a/STATUS b/STATUS
index 21cbcd261f63334287be28b59176fe081d057b90..3edaca2798530fd1a2f2c363d18c09731e595b7d 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -80,15 +80,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ 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

diff --git a/modules/generators/mod_info.c b/modules/generators/mod_info.c
index 7386bb005f52da9d856e1c8f67551d999c53b209..adc34150eee844e80654d9b701753daf13cfbc8e 100644 (file)
--- a/modules/generators/mod_info.c
+++ b/modules/generators/mod_info.c
@@ -721,7 +721,7 @@ static int display_info(request_rec * r)
                                            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);
                             }