From: Graham Leggett <minfrin@apache.org>
Date: Thu, 13 Jun 2013 13:16:18 +0000 (+0000)
Subject: mod_cache_socache: Make sure the CacheSocacheMaxSize directive is merged
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b845e91a3a919d9680eb4bab44a83ab4d085b4c5;p=thirdparty%2Fapache%2Fhttpd.git

mod_cache_socache: Make sure the CacheSocacheMaxSize directive is merged
correctly.


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

diff --git a/CHANGES b/CHANGES
index 1983db36aa3..968de28edaa 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,9 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache 2.5.0
 
+  *) mod_cache_socache: Make sure the CacheSocacheMaxSize directive is merged
+     correctly. [Jens Låås <jelaas gmail.com>]
+
   *) mod_auth_digest: Actually use the secret when generating nonces. This change
      may cause problems if used with round robin load balancers. PR 54637
      [Stefan Fritsch]
diff --git a/modules/cache/mod_cache_socache.c b/modules/cache/mod_cache_socache.c
index e75e124e42a..8f58c12c28f 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;
 }