httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rpl...@apache.org
Subject svn commit: r614663 - in /httpd/httpd/branches/2.2.x: STATUS modules/aaa/mod_authz_host.c
Date Wed, 23 Jan 2008 20:57:58 GMT
Author: rpluem
Date: Wed Jan 23 12:57:51 2008
New Revision: 614663

URL: http://svn.apache.org/viewvc?rev=614663&view=rev
Log:
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

Modified:
    httpd/httpd/branches/2.2.x/STATUS
    httpd/httpd/branches/2.2.x/modules/aaa/mod_authz_host.c

Modified: httpd/httpd/branches/2.2.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/STATUS?rev=614663&r1=614662&r2=614663&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/STATUS (original)
+++ httpd/httpd/branches/2.2.x/STATUS Wed Jan 23 12:57:51 2008
@@ -80,14 +80,6 @@
 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 ]
 

Modified: httpd/httpd/branches/2.2.x/modules/aaa/mod_authz_host.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/modules/aaa/mod_authz_host.c?rev=614663&r1=614662&r2=614663&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/modules/aaa/mod_authz_host.c (original)
+++ httpd/httpd/branches/2.2.x/modules/aaa/mod_authz_host.c Wed Jan 23 12:57:51 2008
@@ -297,8 +297,9 @@
     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;



Mime
View raw message