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

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

diff --git a/CHANGES b/CHANGES
index baab04cec9fb87ee3921ba0e75b2ff6b683305b8..6fda73fcbfe0ea0eebeabdaed767a02c14df2000 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -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]
 

diff --git a/STATUS b/STATUS
index 11d2b573e3b40e2321c84a6b0b079793fab6a8e0..5680d4428587b62572dd64860bc0e2d8401b4128 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -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 ]

diff --git a/server/request.c b/server/request.c
index 37cffdde04e5c2ff90c5ff09f6a1f3ab217f11af..c2fdd89ea49be6e29b8be17a9a387ab944c8de5a 100644 (file)
--- a/server/request.c
+++ b/server/request.c
@@ -1094,9 +1094,9 @@ AP_DECLARE(int) ap_directory_walk(request_rec *r)
             }
             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(request_rec *r)
                  * 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;
             }