svn commit: r1297958 - in /httpd/httpd/trunk: CHANGES modules/mappers/mod_dir.c

[co...@apache.org]

Author: covener
Date: Wed Mar  7 12:42:09 2012
New Revision: 1297958

URL: http://svn.apache.org/viewvc?rev=1297958&view=rev
Log:
PR52845: "DirectoryIndex disabled" should blow away the DirectoryIndex settings
in the current config section, not just override previous config sections.

Modified:
    httpd/httpd/trunk/CHANGES
    httpd/httpd/trunk/modules/mappers/mod_dir.c

Modified: httpd/httpd/trunk/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/CHANGES?rev=1297958&r1=1297957&r2=1297958&view=diff
==============================================================================
--- httpd/httpd/trunk/CHANGES [utf-8] (original)
+++ httpd/httpd/trunk/CHANGES [utf-8] Wed Mar  7 12:42:09 2012
@@ -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.

Modified: httpd/httpd/trunk/modules/mappers/mod_dir.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/mappers/mod_dir.c?rev=1297958&r1=1297957&r2=1297958&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/mappers/mod_dir.c (original)
+++ httpd/httpd/trunk/modules/mappers/mod_dir.c Wed Mar  7 12:42:09 2012
@@ -68,6 +68,7 @@ static const char *add_index(cmd_parms *
             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;
             }
         }