cvs commit: apache/src CHANGES mod_include.c

[Dean Gaudet]

dgaudet     97/07/28 01:46:45

  Modified:    src       CHANGES mod_include.c
  Log:
  fixed unused handle_endif
  
  Submitted by: Howard Fear
  Reviewed by:  Dean Gaudet, Marc Slemko
  
  Revision  Changes    Path
  1.369     +4 -0      apache/src/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /export/home/cvs/apache/src/CHANGES,v
  retrieving revision 1.368
  retrieving revision 1.369
  diff -u -r1.368 -r1.369
  --- CHANGES   1997/07/27 02:38:03     1.368
  +++ CHANGES   1997/07/28 08:46:41     1.369
  @@ -1,5 +1,9 @@
   Changes with Apache 1.3a2
   
  +  *) mod_include cleanup showed that handle_else was being used to handle
  +     endif.  It didn't cause problems, but it was cleaned up too.
  +     [Howard Fear]
  +
     *) mod_cern_meta would attempt to find meta files for the directory itself
        in some cases, but not in others.  It now avoids it in all cases.
        [Dean Gaudet]
  
  
  
  1.45      +2 -2      apache/src/mod_include.c
  
  Index: mod_include.c
  ===================================================================
  RCS file: /export/home/cvs/apache/src/mod_include.c,v
  retrieving revision 1.44
  retrieving revision 1.45
  diff -u -r1.44 -r1.45
  --- mod_include.c     1997/07/27 01:43:26     1.44
  +++ mod_include.c     1997/07/28 08:46:42     1.45
  @@ -1728,6 +1728,7 @@
   #ifdef DEBUG_INCLUDE
   rvputs(r, "**** endif conditional_status=\"", *conditional_status ? "1" : 
"0", "\"\n", NULL);
   #endif
  +        *printing = 1;
           *conditional_status = 1;
           return 0;
       } else {
  @@ -1843,8 +1844,7 @@
                   continue;
               } else if (!strcmp(directive, "endif")) {
                   if (!if_nesting) {
  -                    ret = handle_else(f, r, error, &conditional_status, 
&printing);
  -                    printing = 1;
  +                    ret = handle_endif(f, r, error, &conditional_status, 
&printing);
                   } else {
                       if_nesting--;
                   }