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/03/19 14:33:06 UTC
svn commit: r1302426 - in /httpd/httpd/branches/2.4.x: CHANGES STATUS
server/request.c
Author: jim
Date: Mon Mar 19 13:33:05 2012
New Revision: 1302426
URL: http://svn.apache.org/viewvc?rev=1302426&view=rev
Log:
Merge r1301504 from trunk:
add filesystem paths to some common error messages.
(slightly modified from dev@ post to not bury the "failed/denied")
Submitted by: covener
Reviewed/backported by: jim
Modified:
httpd/httpd/branches/2.4.x/CHANGES
httpd/httpd/branches/2.4.x/STATUS
httpd/httpd/branches/2.4.x/server/request.c
Modified: httpd/httpd/branches/2.4.x/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/CHANGES?rev=1302426&r1=1302425&r2=1302426&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/CHANGES [utf-8] (original)
+++ httpd/httpd/branches/2.4.x/CHANGES [utf-8] Mon Mar 19 13:33:05 2012
@@ -6,6 +6,9 @@ Changes with Apache 2.4.2
envvars: Fix insecure handling of LD_LIBRARY_PATH that could lead to the
current working directory to be searched for DSOs. [Stefan Fritsch]
+ *) core: Add filesystem paths to access denied / access failed messages
+ AH00035 and AH00036. [Eric Covener]
+
*) mod_dumpio: Properly handle errors from subsequent input filters.
PR 52914. [Stefan Fritsch]
Modified: httpd/httpd/branches/2.4.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/STATUS?rev=1302426&r1=1302425&r2=1302426&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/STATUS (original)
+++ httpd/httpd/branches/2.4.x/STATUS Mon Mar 19 13:33:05 2012
@@ -89,10 +89,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
[ start all new proposals below, under PATCHES PROPOSED. ]
- * core: add r->filename to some errorlog access failed / access denied msgs
- Trunk patch: http://svn.apache.org/viewvc?rev=1301504&view=rev
- 2.4.x patch: trunk works
- +1: covener, jorton, trawick
PATCHES PROPOSED TO BACKPORT FROM TRUNK:
[ New proposals should be added at the end of the list ]
Modified: httpd/httpd/branches/2.4.x/server/request.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/server/request.c?rev=1302426&r1=1302425&r2=1302426&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/server/request.c (original)
+++ httpd/httpd/branches/2.4.x/server/request.c Mon Mar 19 13:33:05 2012
@@ -1094,9 +1094,9 @@ AP_DECLARE(int) ap_directory_walk(reques
}
else if (APR_STATUS_IS_EACCES(rv)) {
ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r, APLOGNO(00035)
- "access to %s denied because search "
- "permissions are missing on a component "
- "of the path", r->uri);
+ "access to %s denied (filesystem path '%s') "
+ "because search permissions are missing on a "
+ "component of the path", r->uri, r->filename);
return r->status = HTTP_FORBIDDEN;
}
else if ((rv != APR_SUCCESS && rv != APR_INCOMPLETE)
@@ -1105,7 +1105,8 @@ AP_DECLARE(int) ap_directory_walk(reques
* rather than assume not found.
*/
ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r, APLOGNO(00036)
- "access to %s failed", r->uri);
+ "access to %s failed (filesystem path '%s')",
+ r->uri, r->filename);
return r->status = HTTP_FORBIDDEN;
}