You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by mi...@apache.org on 2013/06/13 15:16:19 UTC
svn commit: r1492663 - in /httpd/httpd/trunk: CHANGES
modules/cache/mod_cache_socache.c
Author: minfrin
Date: Thu Jun 13 13:16:18 2013
New Revision: 1492663
URL: http://svn.apache.org/r1492663
Log:
mod_cache_socache: Make sure the CacheSocacheMaxSize directive is merged
correctly.
Modified:
httpd/httpd/trunk/CHANGES
httpd/httpd/trunk/modules/cache/mod_cache_socache.c
Modified: httpd/httpd/trunk/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/CHANGES?rev=1492663&r1=1492662&r2=1492663&view=diff
==============================================================================
--- httpd/httpd/trunk/CHANGES [utf-8] (original)
+++ httpd/httpd/trunk/CHANGES [utf-8] Thu Jun 13 13:16:18 2013
@@ -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]
Modified: httpd/httpd/trunk/modules/cache/mod_cache_socache.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/cache/mod_cache_socache.c?rev=1492663&r1=1492662&r2=1492663&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/cache/mod_cache_socache.c (original)
+++ httpd/httpd/trunk/modules/cache/mod_cache_socache.c Thu Jun 13 13:16:18 2013
@@ -1292,6 +1292,7 @@ static const char *set_cache_max(cmd_par
< 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;
}