httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j..@apache.org
Subject svn commit: r655540 - in /httpd/httpd/branches/2.2.x: CHANGES server/request.c
Date Mon, 12 May 2008 16:05:04 GMT
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 <jose w3.org>]
+
   *) 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! */



Mime
View raw message