Merge r579664 from trunk:

Reinstate location walk for subrequests
PR 41960 (Jose Kahan)

Submitted by: niq
Reviewed by: jim

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@655540 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/CHANGES b/CHANGES
index d00386c37e5d3fca3c6c0ae9fe9383f3e8611778..bc38a6cd502162bcf64e6cba5000e427d218d6ca 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -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 <jose w3.org>]
+
   *) rotatelogs: Log the current file size and error code/description
      when failing to write to the log file.  [Jeff Trawick]
 

diff --git a/server/request.c b/server/request.c
index 92e9154711a4500be455ce0d2b5e03b85f2c7474..fe4026a3616bdcdd8738a0e6726bf98ad171d21a 100644 (file)
--- 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! */