From cd13b484913e527f0ae0555c1fec3d2ee5d23763 Mon Sep 17 00:00:00 2001 From: Jim Jagielski Date: Tue, 13 Mar 2012 12:08:32 +0000 Subject: [PATCH] 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 --- CHANGES | 4 ++++ STATUS | 5 ----- modules/mappers/mod_dir.c | 1 + 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/CHANGES b/CHANGES index 2d7f631bfe..6c0689f33a 100644 --- 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 440336f8bb..68fbb5ed2e 100644 --- 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 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; } } -- 2.40.0