httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject cvs commit: httpd-2.0/modules/filters mod_include.c
Date Wed, 10 Dec 2003 08:50:11 GMT
stas        2003/12/10 00:50:11

  Modified:    .        Tag: APACHE_2_0_BRANCH CHANGES STATUS
               modules/filters Tag: APACHE_2_0_BRANCH mod_include.c
  Log:
       complain via error_log when mod_include's INCLUDES filter is
       enabled, but the relevant Options flag allowing the filter to run
       for the specific resource wasn't set, so that the filter won't
       silently get skipped. next remove itself, so the warning will be
       logged only once
  Reviewed by:	Jeff Trawick, Bill Rowe
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.988.2.192 +6 -0      httpd-2.0/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/CHANGES,v
  retrieving revision 1.988.2.191
  retrieving revision 1.988.2.192
  diff -u -u -r1.988.2.191 -r1.988.2.192
  --- CHANGES	4 Dec 2003 06:46:25 -0000	1.988.2.191
  +++ CHANGES	10 Dec 2003 08:50:09 -0000	1.988.2.192
  @@ -1,5 +1,11 @@
   Changes with Apache 2.0.49
   
  +  *) complain via error_log when mod_include's INCLUDES filter is
  +     enabled, but the relevant Options flag allowing the filter to run
  +     for the specific resource wasn't set, so that the filter won't
  +     silently get skipped. next remove itself, so the warning will be
  +     logged only once [Stas Bekman, Jeff Trawick, Bill Rowe]
  +
     *) mod_info: HTML escape configuration information so it displays 
        correctly. PR 24232. [Thom May]
        
  
  
  
  1.751.2.586 +1 -8      httpd-2.0/STATUS
  
  Index: STATUS
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/STATUS,v
  retrieving revision 1.751.2.585
  retrieving revision 1.751.2.586
  diff -u -u -r1.751.2.585 -r1.751.2.586
  --- STATUS	10 Dec 2003 03:29:30 -0000	1.751.2.585
  +++ STATUS	10 Dec 2003 08:50:10 -0000	1.751.2.586
  @@ -74,13 +74,6 @@
     [ please place file names and revisions from HEAD here, so it is easy to
       identify exactly what the proposed changes are! ]
   
  -    * mod_include: fix silent INCLUDES ignoring when Options aren't
  -      set by adding a warning 
  -      http://cvs.apache.org/viewcvs.cgi/httpd-2.0/modules/filters/mod_include.c?r1=1.290&r2=1.291
  -      and removing the filter itself
  -      http://cvs.apache.org/viewcvs.cgi/httpd-2.0/modules/filters/mod_include.c?r1=1.291&r2=1.292
  -      +1: stas, nd, erikabele
  -
       * mod_dav: Return a WWW-Auth header for MOVE/COPY requests where
         the destination resource gives a 401.
         http://cvs.apache.org/viewcvs/httpd-2.0/modules/dav/main/mod_dav.c.diff?r1=1.100&r2=1.101
  
  
  
  No                   revision
  No                   revision
  1.232.2.6 +4 -0      httpd-2.0/modules/filters/mod_include.c
  
  Index: mod_include.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/filters/mod_include.c,v
  retrieving revision 1.232.2.5
  retrieving revision 1.232.2.6
  diff -u -u -r1.232.2.5 -r1.232.2.6
  --- mod_include.c	21 Nov 2003 23:38:23 -0000	1.232.2.5
  +++ mod_include.c	10 Dec 2003 08:50:10 -0000	1.232.2.6
  @@ -3358,6 +3358,10 @@
                                                                 &include_module);
   
       if (!(ap_allow_options(r) & OPT_INCLUDES)) {
  +        ap_log_rerror(APLOG_MARK, APLOG_WARNING, 0, r,
  +                      "mod_include: Options +Includes (or IncludesNoExec) "
  +                      "wasn't set, INCLUDES filter removed");
  +        ap_remove_output_filter(f);
           return ap_pass_brigade(f->next, b);
       }
   
  
  
  

Mime
View raw message