From: Ruediger Pluem <rpluem@apache.org>
Date: Wed, 23 Jan 2008 20:57:51 +0000 (+0000)
Subject: Merge r529626 from trunk:
X-Git-Tag: 2.2.9~396
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=051fcc73da4f917dcf033ce3e294c80a3151bc3c;p=thirdparty%2Fapache%2Fhttpd.git

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 6fddb1fa5bc..6c3a993b629 100644
--- 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 5b9ec3380ee..a502951c00d 100644
--- 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;