backported r655540

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

diff --git a/STATUS b/STATUS
index d6fcdbbb56a781f6c3d27a051f6e8fbff96e7fb7..e72b53a7d0fbb673c8a522b4ad585098a09659b0 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -90,33 +90,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-  * core: Reinstate location walk for subrequests.
-    PR: 41960.
-      Trunk version of patch:
-         http://svn.apache.org/viewvc?view=rev&revision=579664
-      Backport version of 2.2.x of patch:
-         Trunk version works (minus CHANGES conflict)
-    +1: niq, wrowe [with chrisd's suggested change below], chrisd [as-is]
-    chrisd says: The patch seems to address the issues in the PR.
-                 My only concern would be that the ap_location_walk() call
-                 (the second one) expects r->uri.  I'm fairly sure that
-                 no native httpd code creates subrequests where r->uri is
-                 NULL.  However, it might be wise to wrap the second
-                 ap_location_walk() with something like:
-                     if(!file_req || (r->uri && r->uri[0] != '\0'))
-                 Things like "RewriteCond /foo -F" can use
-                 ap_sub_req_lookup_file() to create subrequests with
-                 r->uri = "" (but not NULL, I think ...); we might as
-                 well bypass <Location> checks on these, and also handle
-                 any external modules that might try passing r->uri as NULL.
-    chrisd says: I did some testing with NULL and empty r->uri values
-                 and concluded this change appears to be OK as it stands.
-                 If r->uri is NULL then the preceding call to
-                 ap_getparents() crashes, so no functional modules
-                 could be doing this.  As for empty r->uri values,
-                 <LocationMatch ^$> will match against these, so we
-                 shouldn't bypass them.  (Such <LocationMatch> usage may
-                 not be common, but it works and could be in use by someone.)
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]