Treat <files> container like others in mod_info.

PR: 848
Submitted by:	Marc Slemko
Reviewed by:	Dean Gaudet, Ralf S. Engelschall, Ken Coar, Jim Jagielski

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

diff --git a/APACHE_1_2_X/src/CHANGES b/APACHE_1_2_X/src/CHANGES
index f9bf448e37563886ecadc68b5284c8489cc19513..2118a568ec8b5f911af3498c26c553d66d3de972 100644 (file)
--- a/APACHE_1_2_X/src/CHANGES
+++ b/APACHE_1_2_X/src/CHANGES
@@ -1,5 +1,8 @@
 Changes with Apache 1.2.2
-  
+
+  *) Properly treat <files> container like other containers in mod_info.
+     [Marc Slemko] PR#848
+
   *) The proxy didn't treat the "Host:" keyword of the host header as case-
      insensitive.  The proxy would corrupt the first line of a response from
      an HTTP/0.9 server.  [Kenichi Hori <ken@d2.bs1.fc.nec.co.jp>] PR#813,814

diff --git a/APACHE_1_2_X/src/modules/standard/mod_info.c b/APACHE_1_2_X/src/modules/standard/mod_info.c
index 1525dc7c888aeb37b39a05ab516b36619d2904a2..fe6395c56520cc90aefe241972f85b7b22312e7e 100644 (file)
--- a/APACHE_1_2_X/src/modules/standard/mod_info.c
+++ b/APACHE_1_2_X/src/modules/standard/mod_info.c
@@ -164,15 +164,19 @@ void mod_info_module_cmds(request_rec *r, mod_info_config_lines *cfg, command_re
        int lab=0, nest=0;
 
        while(li) {
-               if(!strncasecmp(li->cmd,"<directory",10) || !strncasecmp(li->cmd,"<location",9) ||
-                 !strncasecmp(li->cmd,"<limit",6)) { 
+               if(!strncasecmp(li->cmd,"<directory",10) || 
+                  !strncasecmp(li->cmd,"<location",9) ||
+                  !strncasecmp(li->cmd,"<limit",6) ||
+                  !strncasecmp(li->cmd,"<files",6)) { 
                        if(nest) li_se=li;
                        else li_st=li; 
                        li=li->next; 
                        nest++;
                        continue; 
                } else if(nest && (!strncasecmp(li->cmd,"</limit",7) ||
-                 !strncasecmp(li->cmd,"</location",10) || !strncasecmp(li->cmd,"</directory",11))) { 
+                                  !strncasecmp(li->cmd,"</location",10) || 
+                                  !strncasecmp(li->cmd,"</directory",11) ||
+                                  !strncasecmp(li->cmd,"</files",7))) { 
                        if(block_start) {
                                if((nest==1 && block_start==li_st) || (nest==2 && block_start==li_se)) {
                                        rputs("<dd><tt>",r);
@@ -220,7 +224,8 @@ void mod_info_module_cmds(request_rec *r, mod_info_config_lines *cfg, command_re
                                          && (strncasecmp(li->cmd,"<directory",10) &&
                                          strncasecmp(li->cmd,"<location",9) && strncasecmp(li->cmd,"<limit",6) &&
                                          strncasecmp(li->cmd,"</limit",7) && strncasecmp(li->cmd,"</location",10) &&
-                                         strncasecmp(li->cmd,"</directory",11))) {
+                                         strncasecmp(li->cmd,"</directory",11) &&
+                                         strncasecmp(li->cmd,"</files",7))) {
                                                rputs("<dd><tt>",r);
                                                rputs(mod_info_html_cmd_string(li_st->cmd),r);
                                                rputs(" ",r);