Merge r1297958 from trunk:

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

Submitted by: covener
Reviewed/backported by: jim

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

diff --git a/CHANGES b/CHANGES
index 2d7f631bfe7a5ef731ccc937b0571f4c23d83951..6c0689f33a314457b0dbde5d19d65ff5fce020a3 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -6,6 +6,10 @@ Changes with Apache 2.4.2
      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]
+
   *) mod_xml2enc: Fix broken handling of EOS buckets which could lead to
      response headers not being sent. PR 52766. [Stefan Fritsch]
 

diff --git a/STATUS b/STATUS
index 440336f8bb256108ec80fd3b11cdbb0384b0d64a..68fbb5ed2e5ec661355c582ebb64f218995a9ce9 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -88,11 +88,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
- * mod_dir: Fix "DirectoryIndex disabled" so it wipes out the current config, 
-            not just inherited config.  PR52845
-   Trunk patch: http://svn.apache.org/viewvc?rev=1297958&view=rev
-   2.4.x patch: Trunk patch works
-   +1: covener, sf, igalic
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]

diff --git a/modules/mappers/mod_dir.c b/modules/mappers/mod_dir.c
index 4386dba67ac1494cc029261c22dd51b7386f6d64..52d0273e5dacd0d6bf96a08b1171e53db33fac2a 100644 (file)
--- 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;
             }
         }