--- request.c.orig	2007-05-31 15:35:57.000000000 +0000
+++ request.c.orig	2007-06-04 23:18:48.000000000 +0000
@@ -101,7 +101,6 @@ 
  */
 AP_DECLARE(int) ap_process_request_internal(request_rec *r)
 {
-    int file_req = (r->main && r->filename);
     int access_status;
 
     /* Ignore embedded %2F's in path for proxy requests */
@@ -133,16 +132,15 @@ 
      * next several steps.  Only file subrequests are allowed an empty uri,
      * otherwise let translate_name kill the request.
      */
-    if (!file_req) {
-        if ((access_status = ap_location_walk(r))) {
-            return access_status;
-        }
+    if ((access_status = ap_location_walk(r))) {
+      return access_status;
+    }
 
-        if ((access_status = ap_run_translate_name(r))) {
-            return decl_die(access_status, "translate", r);
-        }
+    if ((access_status = ap_run_translate_name(r))) {
+      return decl_die(access_status, "translate", r);
     }
 
+
     /* Reset to the server default config prior to running map_to_storage
      */
     r->per_dir_config = r->server->lookup_defaults;
@@ -152,14 +150,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! */