From: William A. Rowe Jr <wrowe@apache.org>
Date: Tue, 21 Aug 2012 17:45:59 +0000 (+0000)
Subject: * core: add filesystem paths to some common error messages.
X-Git-Tag: 2.2.23~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=11758744121a7829244dd1fd6fa4e86690a2cdb3;p=thirdparty%2Fapache%2Fhttpd.git

* core: add filesystem paths to some common error messages.

Backports: r1301504
Submitted by: covener
Reviewed by: rjung, trawick, wrowe



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

diff --git a/CHANGES b/CHANGES
index 7dab19334a9..97a5dab618d 100644
--- a/CHANGES
+++ b/CHANGES
@@ -10,6 +10,9 @@ Changes with Apache 2.2.23
      possible XSS for a site where untrusted users can upload files to
      a location with MultiViews enabled. [Niels Heinen <heinenn google.com>]
 
+  *) core: Add filesystem paths to access denied / access failed messages.
+     [Eric Covener]
+
   *) core: Fix error handling in ap_scan_script_header_err_brigade() if there
      is no EOS bucket in the brigade. PR 48272. [Stefan Fritsch]
 
diff --git a/STATUS b/STATUS
index 96d84279485..32f53972da8 100644
--- a/STATUS
+++ b/STATUS
@@ -107,12 +107,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
      2.2.x patch: http://people.apache.org/~rjung/patches/treat_ldap_unavailable_transient-2_2.patch
      +1: rjung, fuankg, wrowe
 
-   * core: add filesystem paths to some common error messages.
-     trunk patch: http://svn.apache.org/viewvc?view=revision&revision=1301504
-     2.4.x patch: http://svn.apache.org/viewvc?view=revision&revision=1302426
-     2.2.x patch: http://people.apache.org/~rjung/patches/improve-forbidden-error-message-2_2.patch
-     +1: rjung, trawick, wrowe
-
 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 93c3145aea8..7005ca9bfae 100644
--- a/server/request.c
+++ b/server/request.c
@@ -1011,7 +1011,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,
-                              "access to %s denied", 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)
@@ -1020,7 +1022,8 @@ AP_DECLARE(int) ap_directory_walk(request_rec *r)
                  * rather than assume not found.
                  */
                 ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r,
-                              "access to %s failed", r->uri);
+                              "access to %s failed (filesystem path '%s')", 
+                              r->uri, r->filename);
                 return r->status = HTTP_FORBIDDEN;
             }