From: Nick Kew <niq@apache.org>
Date: Wed, 26 Sep 2007 14:26:19 +0000 (+0000)
Subject: Reinstate location walk for subrequests
X-Git-Tag: 2.3.0~1393
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4d815c29d1e204f8fd8a171a08c62dd889e4d63f;p=apache

Reinstate location walk for subrequests
PR 41960 (Jose Kahan)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@579664 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/CHANGES b/CHANGES
index 1f96501125..dbf9665848 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,9 @@
 Changes with Apache 2.3.0
 [ When backported to 2.2.x, remove entry from this file ]
 
+  *) core: reinstate location walk to fix config for subrequests
+     PR 41960 [Jose Kahan <jose w3.org>]
+
   *) mod_log_config: Add format options for %p so that the actual local
      or remote port can be logged.  PR 43415.  [Adam Hasselbalch Hansen 
      <ahh@one.com>, Ruediger Pluem, Jeff Trawick]
diff --git a/server/request.c b/server/request.c
index cdf3f364ef..14044be44b 100644
--- a/server/request.c
+++ b/server/request.c
@@ -152,14 +152,10 @@ AP_DECLARE(int) ap_process_request_internal(request_rec *r)
         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! */