From 48a96a88175d3207e5e5a8d8c77315f164fa975f Mon Sep 17 00:00:00 2001 From: Jim Jagielski Date: Tue, 9 Apr 2013 12:15:44 +0000 Subject: [PATCH] Merge r1453604 from trunk: fix merge of min/max file size by setting corresponding _set Submitted by: covener Reviewed/backported by: jim git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1465986 13f79535-47bb-0310-9956-ffa450edef68 --- CHANGES | 5 ++++- STATUS | 5 ----- modules/cache/mod_cache_disk.c | 2 ++ 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/CHANGES b/CHANGES index 0509436ed9..b5e9ba321b 100644 --- a/CHANGES +++ b/CHANGES @@ -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] diff --git a/STATUS b/STATUS index 4a60dfea26..c3af2c48d7 100644 --- a/STATUS +++ b/STATUS @@ -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 diff --git a/modules/cache/mod_cache_disk.c b/modules/cache/mod_cache_disk.c index 8427e8fd60..843921e797 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; } -- 2.40.0