update the misconfigured INCLUDES skipping code to remove itself, so it'd complain

only once
PR:
Obtained from:
Submitted by:
Reviewed by:	Jeff Trawick, Bill Rowe

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

diff --git a/CHANGES b/CHANGES
index 285e025c81ee23d9d4f852ad52369b32b96d9efd..5d554f6534d990ece8f79ae2ca5cd897b7fb7356 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -5,7 +5,8 @@ Changes with Apache 2.1.0-dev
   *) 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]
+     silently get skipped. next remove itself, so the warning will be
+     logged only once [Stas Bekman, Jeff Trawick, Bill Rowe]
 
   *) Clean up httpd -V output: Instead of displaying the MPM source
      directory, display the MPM name and some MPM properties.

diff --git a/modules/filters/mod_include.c b/modules/filters/mod_include.c
index f96d1f3f8267cbcce2fdad8e786a949115fcd37c..a701f57a9e65b5c44a72123e03cf36e4f6b25034 100644 (file)
--- a/modules/filters/mod_include.c
+++ b/modules/filters/mod_include.c
@@ -3603,7 +3603,8 @@ static apr_status_t includes_filter(ap_filter_t *f, apr_bucket_brigade *b)
     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");
+                      "wasn't set, INCLUDES filter removed");
+        ap_remove_output_filter(f);
         return ap_pass_brigade(f->next, b);
     }