httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From traw...@apache.org
Subject cvs commit: httpd-2.0/modules/generators mod_info.c
Date Thu, 04 Dec 2003 06:46:27 GMT
trawick     2003/12/03 22:46:27

  Modified:    .        Tag: APACHE_2_0_BRANCH CHANGES STATUS
               modules/generators Tag: APACHE_2_0_BRANCH mod_info.c
  Log:
  merge this from 2.1-dev:
  
      mod_info: Escape html code in directives and arguments. PR: 24232
  
  PR:              24232
  Submitted by:	 thommay
  Reviewed by:	 nd, trawick, striker
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.988.2.191 +3 -0      httpd-2.0/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/CHANGES,v
  retrieving revision 1.988.2.190
  retrieving revision 1.988.2.191
  diff -u -r1.988.2.190 -r1.988.2.191
  --- CHANGES	4 Dec 2003 06:40:13 -0000	1.988.2.190
  +++ CHANGES	4 Dec 2003 06:46:25 -0000	1.988.2.191
  @@ -1,5 +1,8 @@
   Changes with Apache 2.0.49
   
  +  *) mod_info: HTML escape configuration information so it displays 
  +     correctly. PR 24232. [Thom May]
  +     
     *) Restore the ability to add a description for directories that
        don't contain an index file.  (Broken in 2.0.48) [André Malo]
   
  
  
  
  1.751.2.579 +1 -5      httpd-2.0/STATUS
  
  Index: STATUS
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/STATUS,v
  retrieving revision 1.751.2.578
  retrieving revision 1.751.2.579
  diff -u -r1.751.2.578 -r1.751.2.579
  --- STATUS	4 Dec 2003 06:40:13 -0000	1.751.2.578
  +++ STATUS	4 Dec 2003 06:46:26 -0000	1.751.2.579
  @@ -317,10 +317,6 @@
          (nd: +1 on concept, lacking knowledge prevents me from definitely +1'ing
               it.)
   
  -    * mod_info: Escape html code in directives and arguments. PR: 24232
  -        modules/generators/mod_info.c: r1.52
  -      +1: thommay, nd, trawick, striker
  -
       * Let mod_autoindex show filenames containing special characters.
         PR 13598.
           server/request.c: r1.130
  
  
  
  No                   revision
  No                   revision
  1.49.2.3  +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.49.2.2
  retrieving revision 1.49.2.3
  diff -u -r1.49.2.2 -r1.49.2.3
  --- mod_info.c	1 Nov 2003 16:29:57 -0000	1.49.2.2
  +++ mod_info.c	4 Dec 2003 06:46:27 -0000	1.49.2.3
  @@ -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