diff options
| author | Jim Jagielski <jim@apache.org> | 2017-06-29 11:29:11 +0000 |
|---|---|---|
| committer | Jim Jagielski <jim@apache.org> | 2017-06-29 11:29:11 +0000 |
| commit | ef7fa5ad60e91712d84b17eafc396cdfc0f6eafc (patch) | |
| tree | 65827b737f677c92371eb53e7521da8327c25758 /server | |
| parent | 3170de3d464f5b4c8c9e11fecb3ed0604b7e9761 (diff) | |
| download | httpd-ef7fa5ad60e91712d84b17eafc396cdfc0f6eafc.tar.gz | |
Merge r1735906 from trunk:
Avoid a call to 'prep_walk_cache' if possible, just as in 'ap_if_walk' and 'ap_location_walk'
Submitted by: jailletc36
Reviewed by: jailletc36, jim, ylavic
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1800267 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'server')
| -rw-r--r-- | server/request.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/server/request.c b/server/request.c index fac5f8c7cd..7cead3bffb 100644 --- a/server/request.c +++ b/server/request.c @@ -1615,9 +1615,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 >. @@ -1626,6 +1623,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 */ |