From: Eric Covener <covener@apache.org>
Date: Wed, 6 Mar 2013 22:59:41 +0000 (+0000)
Subject: fix merge of min/max file size by setting corresponding _set
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8a6f4b073b73527c5f82625173e6899b14d3a356;p=thirdparty%2Fapache%2Fhttpd.git

fix merge of min/max file size by setting corresponding _set



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

diff --git a/CHANGES b/CHANGES
index 8b16e9851b6..17b4dc0ebc1 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,11 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache 2.5.0
+ 
+  *) mod_cache_disk: CacheMinFileSize and CacheMaxFileSize were always
+     using compiled in defaults of 1000000/1 respectively. [Eric Covener]
+
+  *) mod_ldap: LDAP connections used for authentication were not respecting
+     LDAPConnectionPoolTimeout.  PR 54587
 
   *) mod_ssl: Quiet FIPS mode weak keys disabled and FIPS not selected emits
      in the error log to debug level.  [William Rowe]
diff --git a/modules/cache/mod_cache_disk.c b/modules/cache/mod_cache_disk.c
index c050e76ab8d..670e4b8d0ce 100644
--- a/modules/cache/mod_cache_disk.c
+++ b/modules/cache/mod_cache_disk.c
@@ -1447,6 +1447,7 @@ static const char
     {
         return "CacheMinFileSize argument must be a non-negative integer representing the min size of a file to cache in bytes.";
     }
+    dconf->minfs_set = 1;
     return NULL;
 }
 
@@ -1460,6 +1461,7 @@ static const char
     {
         return "CacheMaxFileSize argument must be a non-negative integer representing the max size of a file to cache in bytes.";
     }
+    dconf->maxfs_set = 1;
     return NULL;
 }