From ef7fa5ad60e91712d84b17eafc396cdfc0f6eafc Mon Sep 17 00:00:00 2001 From: Jim Jagielski Date: Thu, 29 Jun 2017 11:29:11 +0000 Subject: [PATCH] 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 --- STATUS | 6 ------ server/request.c | 6 +++--- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/STATUS b/STATUS index b34e96ebb1..1cfd5c5c7d 100644 --- a/STATUS +++ b/STATUS @@ -116,12 +116,6 @@ RELEASE SHOWSTOPPERS: PATCHES ACCEPTED TO BACKPORT FROM TRUNK: [ start all new proposals below, under PATCHES PROPOSED. ] - *) core: Save 160 bytes in the request pool and some cycles if no - directive is used. - trunk patch: http://svn.apache.org/r1735906 - 2.4.x patch: svn merge -c 1735906 ^/httpd/httpd/trunk . - +1: jailletc36, jim, ylavic - *) Easy proposals: - mod_authnz_ldap: Log a warning when the LDAP authn provider is configured but an AuthLDAPURL isn't 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 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 . @@ -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 */ -- 2.40.0