summaryrefslogtreecommitdiff
path: root/modules
diff options
context:
space:
mode:
authorJim Jagielski <jim@apache.org>2013-06-24 18:14:30 +0000
committerJim Jagielski <jim@apache.org>2013-06-24 18:14:30 +0000
commita8a5cbadfe3441be8e8da17376102244cd116b9b (patch)
treec078021193c6f88320ccd260b5a752484f6731c4 /modules
parenta113e35e51d6c568567b627465ff37df538d258b (diff)
downloadhttpd-a8a5cbadfe3441be8e8da17376102244cd116b9b.tar.gz
Merge r1492663 from trunk:
mod_cache_socache: Make sure the CacheSocacheMaxSize directive is merged correctly. Submitted by: minfrin Reviewed/backported by: jim git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1496144 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'modules')
-rw-r--r--modules/cache/mod_cache_socache.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/modules/cache/mod_cache_socache.c b/modules/cache/mod_cache_socache.c
index 7be264adce..913de2ee9c 100644
--- a/modules/cache/mod_cache_socache.c
+++ b/modules/cache/mod_cache_socache.c
@@ -1292,6 +1292,7 @@ static const char *set_cache_max(cmd_parms *parms, void *in_struct_ptr,
< 1024) {
return "CacheSocacheMaxSize argument must be a integer representing the max size of a cached entry (headers and body), at least 1024";
}
+ dconf->max_set = 1;
return NULL;
}