Merge r1393033 from trunk:

mod_include: When +Includes is not set and we disable mod_include, tell
the administrator where this happened.

Submitted by: minfrin
Reviewed/backported by: jim

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

diff --git a/STATUS b/STATUS
index 676615b5e78f7e8526ba93d3f09fba1dcc824384..e4ecd2a98bf1265856f8bba6502618f5e844d46a 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -89,12 +89,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
   
-   * mod_include: When +Includes is not set and we disable mod_include, tell
-     the administrator where this happened.
-     trunk patch: http://svn.apache.org/viewvc?rev=1393033&view=rev
-     2.4.x patch: trunk patch works
-     +1: minfrin, rjung, jim
-
    * mod_include: When an include file or virtual path fails, include the result
      code that tells us why.
      trunk patch: http://svn.apache.org/viewvc?rev=1393058&view=rev

diff --git a/modules/filters/mod_include.c b/modules/filters/mod_include.c
index 3d6e8e61d78322bcb912ac3440616bb4ec92ecaa..19bcae25408e95179af507a9fd716fd7bf35281c 100644 (file)
--- a/modules/filters/mod_include.c
+++ b/modules/filters/mod_include.c
@@ -3819,7 +3819,7 @@ 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, APLOGNO(01374)
                       "mod_include: Options +Includes (or IncludesNoExec) "
-                      "wasn't set, INCLUDES filter removed");
+                      "wasn't set, INCLUDES filter removed: %s", r->uri);
         ap_remove_output_filter(f);
         return ap_pass_brigade(f->next, b);
     }