Commit b9eb342c authored by Jim Jagielski's avatar Jim Jagielski
Browse files

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
parent 0953460f

STATUS

+0 −6
Original line number Diff line number Diff line
@@ -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 <If>

            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

server/request.c

+3 −3
Original line number Diff line number Diff line
@@ -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

     */