Return-Path: Delivered-To: apmail-httpd-cvs-archive@www.apache.org Received: (qmail 58713 invoked from network); 12 May 2008 16:05:26 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 12 May 2008 16:05:26 -0000 Received: (qmail 62093 invoked by uid 500); 12 May 2008 16:05:27 -0000 Delivered-To: apmail-httpd-cvs-archive@httpd.apache.org Received: (qmail 62038 invoked by uid 500); 12 May 2008 16:05:27 -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 62029 invoked by uid 99); 12 May 2008 16:05:27 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 12 May 2008 09:05:27 -0700 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 12 May 2008 16:04:49 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id D87C923889FE; Mon, 12 May 2008 09:05:04 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r655540 - in /httpd/httpd/branches/2.2.x: CHANGES server/request.c Date: Mon, 12 May 2008 16:05:04 -0000 To: cvs@httpd.apache.org From: jim@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080512160504.D87C923889FE@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: jim Date: Mon May 12 09:05:03 2008 New Revision: 655540 URL: http://svn.apache.org/viewvc?rev=655540&view=rev Log: Merge r579664 from trunk: Reinstate location walk for subrequests PR 41960 (Jose Kahan) Submitted by: niq Reviewed by: jim Modified: httpd/httpd/branches/2.2.x/CHANGES httpd/httpd/branches/2.2.x/server/request.c Modified: httpd/httpd/branches/2.2.x/CHANGES URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/CHANGES?rev=655540&r1=655539&r2=655540&view=diff ============================================================================== --- httpd/httpd/branches/2.2.x/CHANGES [utf-8] (original) +++ httpd/httpd/branches/2.2.x/CHANGES [utf-8] Mon May 12 09:05:03 2008 @@ -1,6 +1,9 @@ -*- coding: utf-8 -*- Changes with Apache 2.2.9 + *) core: reinstate location walk to fix config for subrequests + PR 41960 [Jose Kahan ] + *) rotatelogs: Log the current file size and error code/description when failing to write to the log file. [Jeff Trawick] Modified: httpd/httpd/branches/2.2.x/server/request.c URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/server/request.c?rev=655540&r1=655539&r2=655540&view=diff ============================================================================== --- httpd/httpd/branches/2.2.x/server/request.c (original) +++ httpd/httpd/branches/2.2.x/server/request.c Mon May 12 09:05:03 2008 @@ -152,14 +152,10 @@ return access_status; } - /* Excluding file-specific requests with no 'true' URI... + /* Rerun the location walk, which overrides any map_to_storage config. */ - if (!file_req) { - /* Rerun the location walk, which overrides any map_to_storage config. - */ - if ((access_status = ap_location_walk(r))) { - return access_status; - } + if ((access_status = ap_location_walk(r))) { + return access_status; } /* Only on the main request! */