From: Eric Covener <covener@apache.org>
Date: Wed, 7 Mar 2012 12:42:09 +0000 (+0000)
Subject: PR52845: "DirectoryIndex disabled" should blow away the DirectoryIndex settings
X-Git-Tag: 2.5.0-alpha~7407
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7ab4cfe81a4a89afcab2fb49c24b9b8221140cea;p=apache

PR52845: "DirectoryIndex disabled" should blow away the DirectoryIndex settings
in the current config section, not just override previous config sections.


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

diff --git a/CHANGES b/CHANGES
index a3b1d3a1c2..16455944dd 100644
--- a/CHANGES
+++ b/CHANGES
@@ -5,6 +5,10 @@ Changes with Apache 2.5.0
      envvars: Fix insecure handling of LD_LIBRARY_PATH that could lead to the
      current working directory to be searched for DSOs. [Stefan Fritsch]
 
+  *) "DirectoryIndex disabled" now undoes DirectoryIndex settings in
+     the current configuration section, not just previous config sections.
+     PR52845 [Eric Covener]
+
   *) Fix MPM DSO load failure on AIX.  [Jeff Trawick]
 
   *) core: Add the port number to the vhost's name in the scoreboard.
diff --git a/modules/mappers/mod_dir.c b/modules/mappers/mod_dir.c
index 4386dba67a..52d0273e5d 100644
--- a/modules/mappers/mod_dir.c
+++ b/modules/mappers/mod_dir.c
@@ -68,6 +68,7 @@ static const char *add_index(cmd_parms *cmd, void *dummy, const char *arg)
             const char *ww = ap_getword_conf(cmd->temp_pool, &tt);
             if (ww == NULL || !ww[0]) {
                /* "disabled" is first, and alone */
+               apr_array_clear(d->index_names); 
                break;
             }
         }