cvs commit: apache/src mod_info.c

[Marc Slemko]

marc        97/07/12 12:52:16

  Modified:    src       mod_info.c
  Log:
  Properly treat <files> container like other containers in mod_info.
  
  Reviewed by:  Jim Jagielski
  PR: 848
  
  Revision  Changes    Path
  1.18      +9 -4      apache/src/mod_info.c
  
  Index: mod_info.c
  ===================================================================
  RCS file: /export/home/cvs/apache/src/mod_info.c,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -C3 -r1.17 -r1.18
  *** mod_info.c        1997/06/15 19:22:30     1.17
  --- mod_info.c        1997/07/12 19:52:15     1.18
  ***************
  *** 165,179 ****
        int lab=0, nest=0;
    
        while(li) {
  !             if(!strncasecmp(li->cmd,"<directory",10) || 
!strncasecmp(li->cmd,"<location",9) ||
  !               !strncasecmp(li->cmd,"<limit",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))) { 
                        if(block_start) {
                                if((nest==1 && block_start==li_st) || (nest==2 
&& block_start==li_se)) {
                                        rputs("<dd><tt>",r);
  --- 165,183 ----
        int lab=0, nest=0;
    
        while(li) {
  !             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,"</files",7))) { 
                        if(block_start) {
                                if((nest==1 && block_start==li_st) || (nest==2 
&& block_start==li_se)) {
                                        rputs("<dd><tt>",r);
  ***************
  *** 221,227 ****
                                          && 
(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))) {
                                                rputs("<dd><tt>",r);
                                                
rputs(mod_info_html_cmd_string(li_st->cmd),r);
                                                rputs(" ",r);
  --- 225,232 ----
                                          && 
(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,"</files",7))) {
                                                rputs("<dd><tt>",r);
                                                
rputs(mod_info_html_cmd_string(li_st->cmd),r);
                                                rputs(" ",r);