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
PR:
Obtained from:
Submitted by:
Reviewed by:	Jeff Trawick, Bill Rowe

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

diff --git a/CHANGES b/CHANGES
index 5ac626b37a4637a664529951d5d7e11fb10c12be..e08975eda753ed12d5a8b1383229890f6c224b77 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -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]
      

diff --git a/STATUS b/STATUS
index a6d09a5fccf7717ac8c324f4c89a6d4bbb5ed829..32461a8de7b9c0ad124a6a1ac64fe55a7b23b4ff 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -1,5 +1,5 @@
 APACHE 2.0 STATUS:                                              -*-text-*-
-Last modified at [$Date: 2003/12/10 03:29:30 $]
+Last modified at [$Date: 2003/12/10 08:50:10 $]
 
 Release:
 
@@ -74,13 +74,6 @@ PATCHES TO BACKPORT FROM 2.1
   [ 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

diff --git a/modules/filters/mod_include.c b/modules/filters/mod_include.c
index 092badd24ee29e000a16c138ad39451d4606ceff..5b1c7b19cb3e5cb6f006d450d9a70d11d3895820 100644 (file)
--- a/modules/filters/mod_include.c
+++ b/modules/filters/mod_include.c
@@ -3358,6 +3358,10 @@ static apr_status_t includes_filter(ap_filter_t *f, apr_bucket_brigade *b)
                                                               &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);
     }