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 CHANGES
Date Tue, 09 Dec 2003 01:58:21 GMT
stas        2003/12/08 17:58:21

  Modified:    modules/filters mod_include.c
               .        CHANGES
  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.
  Reviewed by:	nd
  
  Revision  Changes    Path
  1.291     +3 -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.290
  retrieving revision 1.291
  diff -u -u -r1.290 -r1.291
  --- mod_include.c	2 Nov 2003 22:09:19 -0000	1.290
  +++ mod_include.c	9 Dec 2003 01:58:21 -0000	1.291
  @@ -3601,6 +3601,9 @@
                                                          &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, passing data unmodified");
           return ap_pass_brigade(f->next, b);
       }
   
  
  
  
  1.1334    +5 -0      httpd-2.0/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/CHANGES,v
  retrieving revision 1.1333
  retrieving revision 1.1334
  diff -u -u -r1.1333 -r1.1334
  --- CHANGES	4 Dec 2003 06:48:19 -0000	1.1333
  +++ CHANGES	9 Dec 2003 01:58:21 -0000	1.1334
  @@ -2,6 +2,11 @@
   
     [Remove entries to the current 2.0 section below, when backported]
   
  +  *) 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. [Stas Bekman]
  +
     *) Clean up httpd -V output: Instead of displaying the MPM source
        directory, display the MPM name and some MPM properties.
        [Geoffrey Young <geoff apache.org>]
  
  
  

Mime
View raw message