Return-Path: Delivered-To: apmail-httpd-cvs-archive@www.apache.org Received: (qmail 15112 invoked from network); 23 Jan 2008 20:58:22 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 23 Jan 2008 20:58:22 -0000 Received: (qmail 40741 invoked by uid 500); 23 Jan 2008 20:58:12 -0000 Delivered-To: apmail-httpd-cvs-archive@httpd.apache.org Received: (qmail 40687 invoked by uid 500); 23 Jan 2008 20:58:12 -0000 Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm Precedence: bulk Reply-To: dev@httpd.apache.org list-help: list-unsubscribe: List-Post: List-Id: Delivered-To: mailing list cvs@httpd.apache.org Received: (qmail 40676 invoked by uid 99); 23 Jan 2008 20:58:12 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 23 Jan 2008 12:58:12 -0800 X-ASF-Spam-Status: No, hits=-100.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 23 Jan 2008 20:58:07 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 4B6CE1A9832; Wed, 23 Jan 2008 12:57:59 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit 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 -0000 To: cvs@httpd.apache.org From: rpluem@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080123205759.4B6CE1A9832@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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;