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.
PR:
Obtained from:
Submitted by:
Reviewed by:	nd

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

diff --git a/CHANGES b/CHANGES
index 368ebf351da1b641e9743ccf354a13c74aee7fa5..285e025c81ee23d9d4f852ad52369b32b96d9efd 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,11 @@ Changes with Apache 2.1.0-dev
 
   [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>]

diff --git a/modules/filters/mod_include.c b/modules/filters/mod_include.c
index 3f4b416e57f77b73e403546b5504660a47df5f1c..f96d1f3f8267cbcce2fdad8e786a949115fcd37c 100644 (file)
--- a/modules/filters/mod_include.c
+++ b/modules/filters/mod_include.c
@@ -3601,6 +3601,9 @@ 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, passing data unmodified");
         return ap_pass_brigade(f->next, b);
     }