You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by ji...@apache.org on 2012/10/04 14:52:24 UTC
svn commit: r1394026 - in /httpd/httpd/branches/2.4.x: ./ STATUS
modules/filters/mod_include.c
Author: jim
Date: Thu Oct 4 12:52:24 2012
New Revision: 1394026
URL: http://svn.apache.org/viewvc?rev=1394026&view=rev
Log:
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
Modified:
httpd/httpd/branches/2.4.x/ (props changed)
httpd/httpd/branches/2.4.x/STATUS
httpd/httpd/branches/2.4.x/modules/filters/mod_include.c
Propchange: httpd/httpd/branches/2.4.x/
------------------------------------------------------------------------------
Merged /httpd/httpd/trunk:r1393033
Modified: httpd/httpd/branches/2.4.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/STATUS?rev=1394026&r1=1394025&r2=1394026&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/STATUS (original)
+++ httpd/httpd/branches/2.4.x/STATUS Thu Oct 4 12:52:24 2012
@@ -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
Modified: httpd/httpd/branches/2.4.x/modules/filters/mod_include.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/filters/mod_include.c?rev=1394026&r1=1394025&r2=1394026&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/filters/mod_include.c (original)
+++ httpd/httpd/branches/2.4.x/modules/filters/mod_include.c Thu Oct 4 12:52:24 2012
@@ -3819,7 +3819,7 @@ static apr_status_t includes_filter(ap_f
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);
}