svn commit: r1453604 - in /httpd/httpd/trunk: CHANGES modules/cache/mod_cache_disk.c

[co...@apache.org]

Author: covener
Date: Wed Mar  6 22:59:41 2013
New Revision: 1453604

URL: http://svn.apache.org/r1453604
Log:
fix merge of min/max file size by setting corresponding _set


Modified:
    httpd/httpd/trunk/CHANGES
    httpd/httpd/trunk/modules/cache/mod_cache_disk.c

Modified: httpd/httpd/trunk/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/CHANGES?rev=1453604&r1=1453603&r2=1453604&view=diff
==============================================================================
--- httpd/httpd/trunk/CHANGES [utf-8] (original)
+++ httpd/httpd/trunk/CHANGES [utf-8] Wed Mar  6 22:59:41 2013
@@ -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]

Modified: httpd/httpd/trunk/modules/cache/mod_cache_disk.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/cache/mod_cache_disk.c?rev=1453604&r1=1453603&r2=1453604&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/cache/mod_cache_disk.c (original)
+++ httpd/httpd/trunk/modules/cache/mod_cache_disk.c Wed Mar  6 22:59:41 2013
@@ -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;
 }
 

Re: svn commit: r1453604 - in /httpd/httpd/trunk: CHANGES modules/cache/mod_cache_disk.c

[Eric Covener <co...@apache.org>]

> +
> +  *) 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
>

2nd inadvertent looking entry had accompanying code in 1452551.