Commit 190eb2f9 authored by William A. Rowe Jr's avatar William A. Rowe Jr
Browse files 

  I love it when a plan comes together.

  We hadn't prepared for this possibility that someone didn't set up the
  r->per_dir_config (which the subreq's didn't).  Since we are first in
  line, we will handle it if need be.


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

server/request.c

+3 −0
Original line number Diff line number Diff line
@@ -1204,6 +1204,9 @@ AP_DECLARE(int) ap_location_walk(request_rec *r) 
    /* Merge our per_uri_defaults preconstruct onto the r->per_dir_configs,

     * and note the end result for later optimization.

     */

    if (!r->per_dir_config)

        r->per_dir_config = r->server->lookup_defaults;

    

    if (per_uri_defaults)

        r->per_dir_config = ap_merge_per_dir_configs(r->pool,

                                                     r->per_dir_config,