From 2c1b942e47b6a8ca3db5766c0221164e9aff66eb Mon Sep 17 00:00:00 2001 From: Stefan Fritsch Date: Sat, 24 Mar 2012 16:32:53 +0000 Subject: [PATCH] Fix merging of AllowOverrideList and ContentDigest. Remove some useless code. Pointed out by coverner git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1304852 13f79535-47bb-0310-9956-ffa450edef68 --- CHANGES | 3 +++ server/core.c | 6 ++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/CHANGES b/CHANGES index d61aca8c98b..e969696e308 100644 --- a/CHANGES +++ b/CHANGES @@ -1,6 +1,9 @@ -*- coding: utf-8 -*- Changes with Apache 2.5.0 + *) core: Fix merging of AllowOverrideList and ContentDigest. + [Stefan Fritsch] + *) core: Disallow directives in AllowOverrideList which are only allowed in VirtualHost or server context. These are usually not prepared to be called in .htaccess files. [Stefan Fritsch] diff --git a/server/core.c b/server/core.c index 96171109205..541f6e8e74a 100644 --- a/server/core.c +++ b/server/core.c @@ -247,7 +247,7 @@ static void *merge_core_dir_configs(apr_pool_t *a, void *basev, void *newv) conf->override_opts = new->override_opts; } - if (conf->override_list == NULL) { + if (new->override_list != NULL) { conf->override_list = new->override_list; } @@ -274,7 +274,7 @@ static void *merge_core_dir_configs(apr_pool_t *a, void *basev, void *newv) conf->hostname_lookups = new->hostname_lookups; } - if (new->content_md5 == AP_CONTENT_MD5_UNSET) { + if (new->content_md5 != AP_CONTENT_MD5_UNSET) { conf->content_md5 = new->content_md5; } @@ -314,8 +314,6 @@ static void *merge_core_dir_configs(apr_pool_t *a, void *basev, void *newv) if (new->limit_xml_body != AP_LIMIT_UNSET) conf->limit_xml_body = new->limit_xml_body; - else - conf->limit_xml_body = base->limit_xml_body; if (!conf->sec_file) { conf->sec_file = new->sec_file; -- 2.47.3