svn commit: r1305014 - in /httpd/httpd/branches/2.4.x: CHANGES STATUS server/core.c

[co...@apache.org]

Author: covener
Date: Sun Mar 25 12:03:30 2012
New Revision: 1305014

URL: http://svn.apache.org/viewvc?rev=1305014&view=rev
Log:
Submitted by: sf
Reviewed by: sf, trawick, covener

Merge r1304852 from trunk:

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


Modified:
    httpd/httpd/branches/2.4.x/CHANGES
    httpd/httpd/branches/2.4.x/STATUS
    httpd/httpd/branches/2.4.x/server/core.c

Modified: httpd/httpd/branches/2.4.x/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/CHANGES?rev=1305014&r1=1305013&r2=1305014&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/CHANGES [utf-8] (original)
+++ httpd/httpd/branches/2.4.x/CHANGES [utf-8] Sun Mar 25 12:03:30 2012
@@ -6,6 +6,9 @@ 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]
 
+  *) core: Fix merging of AllowOverrideList and ContentDigest.
+     [Stefan Fritsch]
+
   *) mod_request: Fix validation of the KeptBodySize argument so it
      doesn't always throw a configuration error. PR 52981 [Eric Covener]
 

Modified: httpd/httpd/branches/2.4.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/STATUS?rev=1305014&r1=1305013&r2=1305014&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/STATUS (original)
+++ httpd/httpd/branches/2.4.x/STATUS Sun Mar 25 12:03:30 2012
@@ -88,11 +88,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-  * core: Fix merging of AllowOverrideList and ContentDigest.
-    Trunk patch: http://svn.apache.org/viewvc?rev=1304852&view=rev
-    2.4.x patch: Trunk patch works
-    +1: sf, trawick, covener
-
   * mod_remoteip: Downgrade log message level
     Trunk patch: http://svn.apache.org/viewvc?rev=1304855&view=rev
     2.4.x patch: Trunk patch works

Modified: httpd/httpd/branches/2.4.x/server/core.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/server/core.c?rev=1305014&r1=1305013&r2=1305014&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/server/core.c (original)
+++ httpd/httpd/branches/2.4.x/server/core.c Sun Mar 25 12:03:30 2012
@@ -247,7 +247,7 @@ static void *merge_core_dir_configs(apr_
         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_
         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_
 
     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;