httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From thom...@apache.org
Subject cvs commit: httpd-2.0/modules/generators mod_info.c
Date Thu, 30 Oct 2003 16:43:45 GMT
thommay     2003/10/30 08:43:45

  Modified:    .        CHANGES
               modules/generators mod_info.c
  Log:
  * modules/generators/mod_info.c:
          (mod_info_module_cmds) ap_escape_html() all directives and
          arguments.
  PR: 24232
  
  Revision  Changes    Path
  1.1302    +3 -0      httpd-2.0/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/CHANGES,v
  retrieving revision 1.1301
  retrieving revision 1.1302
  diff -u -r1.1301 -r1.1302
  --- CHANGES	29 Oct 2003 20:56:28 -0000	1.1301
  +++ CHANGES	30 Oct 2003 16:43:44 -0000	1.1302
  @@ -2,6 +2,9 @@
   
     [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]
   
  
  
  
  1.52      +7 -4      httpd-2.0/modules/generators/mod_info.c
  
  Index: mod_info.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/generators/mod_info.c,v
  retrieving revision 1.51
  retrieving revision 1.52
  diff -u -r1.51 -r1.52
  --- mod_info.c	19 Sep 2003 20:02:04 -0000	1.51
  +++ mod_info.c	30 Oct 2003 16:43:45 -0000	1.52
  @@ -181,7 +181,7 @@
   		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 @@
   		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;
  
  
  

Mime
View raw message