From 6a12a80005df6ddbc8bde5e060c4997f1ef0745d Mon Sep 17 00:00:00 2001 From: Jim Jagielski Date: Mon, 19 Mar 2012 13:33:05 +0000 Subject: [PATCH] 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 --- CHANGES | 3 +++ STATUS | 4 ---- server/request.c | 9 +++++---- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/CHANGES b/CHANGES index baab04cec9..6fda73fcbf 100644 --- 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 11d2b573e3..5680d44285 100644 --- 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 37cffdde04..c2fdd89ea4 100644 --- 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; } -- 2.40.0