Bugfix the case where multiple <Directory>s match and all are applied

Submitted by:	Dean Gaudet
Reviewed by:	Dean Gaudet, Ralf S. Engelschall, Randy Terbush

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3@78867 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/APACHE_1_2_X/src/CHANGES b/APACHE_1_2_X/src/CHANGES
index 66f438959a8f71522cc6dc39add1947a6d736127..7f4aef64e52d8f94bc6ef15630eb41275fd77c30 100644 (file)
--- a/APACHE_1_2_X/src/CHANGES
+++ b/APACHE_1_2_X/src/CHANGES
@@ -1,5 +1,8 @@
 Changes with Apache 1.2.2
 
+  *) Bugfix for case where multiple <Directory>s match and all are applied.
+     [Dean Gaudet]
+
   *) Fixed an infinite loop in mod_imap for references above the server root
      [Dean Gaudet] PR#748
 

diff --git a/APACHE_1_2_X/src/main/http_request.c b/APACHE_1_2_X/src/main/http_request.c
index 77fa0a67e266933d0c3e8402ccc3e66c21c07897..1e63629dcfd1ddf8df36de4430aca60244b28bea 100644 (file)
--- a/APACHE_1_2_X/src/main/http_request.c
+++ b/APACHE_1_2_X/src/main/http_request.c
@@ -344,7 +344,7 @@ int directory_walk (request_rec *r)
         core_dir_config *core_dir =
          (core_dir_config *)get_module_config(per_dir_defaults, &core_module);
        int overrides_here;
-        void *this_conf = NULL, *htaccess_conf = NULL;
+        void *this_conf, *htaccess_conf = NULL;
        char *this_dir = make_dirstr (r->pool, test_filename, i);
        int j;
       
@@ -373,6 +373,7 @@ int directory_walk (request_rec *r)
              (core_dir_config *)get_module_config(entry_config, &core_module);
            entry_dir = entry_core->d;
        
+           this_conf = NULL;
            if (entry_core->r) {
                if (!regexec(entry_core->r, this_dir, 0, NULL,
                             (j == num_sec) ? 0 : REG_NOTEOL)) {