From: Jim Jagielski <jim@apache.org>
Date: Mon, 24 Jun 2013 18:14:30 +0000 (+0000)
Subject: Merge r1492663 from trunk:
X-Git-Tag: 2.4.5~79
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a8a5cbadfe3441be8e8da17376102244cd116b9b;p=apache

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
---

diff --git a/CHANGES b/CHANGES
index 2c938bdd70..b1d3212c78 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,9 +1,13 @@
                                                          -*- coding: utf-8 -*-
-  *) rotatelogs: add -n number-of-files option to roate through a number
-     of fixed-name logfiles. [Eric Covener]
 
 Changes with Apache 2.4.5
 
+  *) mod_cache_socache: Make sure the CacheSocacheMaxSize directive is merged
+     correctly. [Jens Låås <jelaas gmail.com>]
+
+  *) rotatelogs: add -n number-of-files option to roate through a number
+     of fixed-name logfiles. [Eric Covener]
+
   *) mod_proxy: Support web-socket tunnels via mod_proxy_wstunnel.
      [Jim Jagielski]
 
diff --git a/STATUS b/STATUS
index 81157d88b8..ebc01d3492 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_socache: Make sure the CacheSocacheMaxSize directive is merged
-      correctly.
-      trunk patch: http://svn.apache.org/r1492663
-      2.4.x patch: trunk patch works modulo CHANGES
-      +1: minfrin, covener, jailletc36
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
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;
 }