httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j..@apache.org
Subject svn commit: r1465986 - in /httpd/httpd/branches/2.4.x: ./ CHANGES STATUS modules/cache/mod_cache_disk.c
Date Tue, 09 Apr 2013 12:15:45 GMT
Author: jim
Date: Tue Apr  9 12:15:44 2013
New Revision: 1465986

URL: http://svn.apache.org/r1465986
Log:
Merge r1453604 from trunk:

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


Submitted by: covener
Reviewed/backported by: jim

Modified:
    httpd/httpd/branches/2.4.x/   (props changed)
    httpd/httpd/branches/2.4.x/CHANGES
    httpd/httpd/branches/2.4.x/STATUS
    httpd/httpd/branches/2.4.x/modules/cache/mod_cache_disk.c

Propchange: httpd/httpd/branches/2.4.x/
------------------------------------------------------------------------------
  Merged /httpd/httpd/trunk:r1453604

Modified: httpd/httpd/branches/2.4.x/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/CHANGES?rev=1465986&r1=1465985&r2=1465986&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/CHANGES [utf-8] (original)
+++ httpd/httpd/branches/2.4.x/CHANGES [utf-8] Tue Apr  9 12:15:44 2013
@@ -1,7 +1,10 @@
                                                          -*- coding: utf-8 -*-
-
+ 
 Changes with Apache 2.4.5
 
+  *) mod_cache_disk: CacheMinFileSize and CacheMaxFileSize were always
+     using compiled in defaults of 1000000/1 respectively. [Eric Covener]
+
   *) mod_lbmethod_heartbeat, mod_heartmonitor: Respect DefaultRuntimeDir/
      DEFAULT_REL_RUNTIMEDIR for the heartbeat storage file.  [Jeff Trawick]
 

Modified: httpd/httpd/branches/2.4.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/STATUS?rev=1465986&r1=1465985&r2=1465986&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/STATUS (original)
+++ httpd/httpd/branches/2.4.x/STATUS Tue Apr  9 12:15:44 2013
@@ -90,11 +90,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-  * mod_cache_disk: fix merge of min/max file size by setting corresponding _set
-    trunk patch: http://svn.apache.org/r1453604
-    2.4.x patch: trunk patch works
-    +1: humbedooh, jim, covener
-
   * mod_ssl: Quiet FIPS mode weak keys disabled and FIPS not selected emits
     in the error log to debug level.  [William Rowe]
     trunk patch: http://svn.apache.org/viewvc?view=revision&revision=1447993

Modified: httpd/httpd/branches/2.4.x/modules/cache/mod_cache_disk.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/cache/mod_cache_disk.c?rev=1465986&r1=1465985&r2=1465986&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/cache/mod_cache_disk.c (original)
+++ httpd/httpd/branches/2.4.x/modules/cache/mod_cache_disk.c Tue Apr  9 12:15:44 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;
 }
 



Mime
View raw message