From: Thom May <thommay@apache.org>
Date: Thu, 30 Oct 2003 16:43:45 +0000 (+0000)
Subject: * modules/generators/mod_info.c:
X-Git-Tag: pre_ajp_proxy~1093
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=63abfc7538508ff74ea6c9e9bd63764cc4158472;p=thirdparty%2Fapache%2Fhttpd.git

* modules/generators/mod_info.c:
        (mod_info_module_cmds) ap_escape_html() all directives and
        arguments.
PR: 24232


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

diff --git a/CHANGES b/CHANGES
index e9585e5137b..85ef4d7d0cf 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,9 @@ Changes with Apache 2.1.0-dev
 
   [Remove entries to the current 2.0 section below, when backported]
 
+  *) mod_info: HTML escape configuration information so it displays 
+     correctly. PR 24232. [Thom May]
+     
   *) mod_status: Report total CPU time accurately when using a threaded
      MPM.  PR 23795.  [Jeff Trawick]
 
diff --git a/modules/generators/mod_info.c b/modules/generators/mod_info.c
index 9dffaf5b087..888cb1383f3 100644
--- a/modules/generators/mod_info.c
+++ b/modules/generators/mod_info.c
@@ -181,7 +181,7 @@ static void mod_info_module_cmds(request_rec * r, const command_rec * cmds,
 		if (nest > block_start) {
 		    block_start++;
 		    apr_snprintf(htmlstring, sizeof(htmlstring), "%s %s",
-				tmptree->parent->directive,
+                                tmptree->parent->directive,
 				tmptree->parent->args);
                     ap_rputs("<dd><tt>", r);
                     mod_info_html_cmd_string(r, htmlstring, 0);
@@ -190,15 +190,18 @@ static void mod_info_module_cmds(request_rec * r, const command_rec * cmds,
 		if (nest == 2) {
 		    ap_rprintf(r, "<dd><tt>&nbsp;&nbsp;&nbsp;&nbsp;%s "
 			       "<i>%s</i></tt></dd>\n",
-			       tmptree->directive, tmptree->args);
+                               ap_escape_html(r->pool,tmptree->directive), 
+                               ap_escape_html(r->pool,tmptree->args));
 		} else if (nest == 1) {
 		    ap_rprintf(r,
 			       "<dd><tt>&nbsp;&nbsp;%s <i>%s</i></tt></dd>\n",
-			       tmptree->directive, tmptree->args);
+                               ap_escape_html(r->pool,tmptree->directive), 
+                               ap_escape_html(r->pool,tmptree->args));
 		} else {
                     ap_rputs("<dd><tt>", r);
                     mod_info_html_cmd_string(r, tmptree->directive, 0);
-                    ap_rprintf(r, " <i>%s</i></tt></dd>\n", tmptree->args);
+                    ap_rprintf(r, " <i>%s</i></tt></dd>\n", 
+                               ap_escape_html(r->pool,tmptree->args));
 		}
 	    }
 	    ++cmd;