From: Stefan Fritsch <sf@apache.org>
Date: Sat, 24 Mar 2012 16:32:53 +0000 (+0000)
Subject: Fix merging of AllowOverrideList and ContentDigest.
X-Git-Tag: 2.5.0-alpha~7313
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5b0c08477f6565198c18d664acf557ecd6988024;p=apache

Fix merging of AllowOverrideList and ContentDigest.
Remove some useless code.
Pointed out by covener


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

diff --git a/CHANGES b/CHANGES
index d61aca8c98..e969696e30 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 9617110920..541f6e8e74 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;