Merge r529626 from trunk:

log the uri for some access-denied paths when r->filename is
unset

Submitted by: trawick
Reviewed by: trawick, rpluem, covener

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

diff --git a/STATUS b/STATUS
index 6fddb1fa5bc93af6feb10829c378b4be47c8ae5d..6c3a993b629275b454dbab5387ab7c0a7a71ae17 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -80,14 +80,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-  * mod_authz_host: Log uri in "client denied" message for non-file
-    requests.
-      Trunk version of patch:
-        http://svn.apache.org/viewvc?view=rev&revision=529626
-      Backport version for 2.2.x of patch:
-        http://people.apache.org/~trawick/r529626_to_22x.txt
-      +1: trawick, rpluem, covener
-
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
 

diff --git a/modules/aaa/mod_authz_host.c b/modules/aaa/mod_authz_host.c
index 5b9ec3380eec997982220c44ac8901791f60c56c..a502951c00d8b3e8a97eb6e33feaf0b6cda0226c 100644 (file)
--- a/modules/aaa/mod_authz_host.c
+++ b/modules/aaa/mod_authz_host.c
@@ -297,8 +297,9 @@ static int check_dir_access(request_rec *r)
     if (ret == HTTP_FORBIDDEN
         && (ap_satisfies(r) != SATISFY_ANY || !ap_some_auth_required(r))) {
         ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
-            "client denied by server configuration: %s",
-            r->filename);
+            "client denied by server configuration: %s%s",
+            r->filename ? "" : "uri ",
+            r->filename ? r->filename : r->uri);
     }
 
     return ret;