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

diff --git a/server/request.c b/server/request.c
index 6804cb401799811f596d53c51e3eb8167e73167d..627563d3f4218712d6deec5da3f3613350f9e0e8 100644 (file)
--- a/server/request.c
+++ b/server/request.c
@@ -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,