From: Christophe Jaillet <jailletc36@apache.org>
Date: Sun, 20 Mar 2016 21:22:14 +0000 (+0000)
Subject: Avoid a call to 'prep_walk_cache' if possible, just as in 'ap_if_walk' and 'ap_locati... 
X-Git-Tag: 2.5.0-alpha~1858
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=985d9885d756e28e5f34f2241280dda1ebf775c6;p=apache

Avoid a call to 'prep_walk_cache' if possible, just as in 'ap_if_walk' and 'ap_location_walk'

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

diff --git a/server/request.c b/server/request.c
index e96e4f1888..b097e99007 100644
--- a/server/request.c
+++ b/server/request.c
@@ -1606,9 +1606,6 @@ AP_DECLARE(int) ap_file_walk(request_rec *r)
         return OK;
     }
 
-    cache = prep_walk_cache(AP_NOTE_FILE_WALK, r);
-    cached = (cache->cached != NULL);
-
     /* No tricks here, there are just no <Files > to parse in this context.
      * We won't destroy the cache, just in case _this_ redirect is later
      * redirected again to a context containing the same or similar <Files >.
@@ -1617,6 +1614,9 @@ AP_DECLARE(int) ap_file_walk(request_rec *r)
         return OK;
     }
 
+    cache = prep_walk_cache(AP_NOTE_FILE_WALK, r);
+    cached = (cache->cached != NULL);
+
     /* Get the basename .. and copy for the cache just
      * in case r->filename is munged by another module
      */