You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by ji...@apache.org on 2013/06/24 20:14:30 UTC
svn commit: r1496144 - in /httpd/httpd/branches/2.4.x: ./ CHANGES STATUS
modules/cache/mod_cache_socache.c
Author: jim
Date: Mon Jun 24 18:14:30 2013
New Revision: 1496144
URL: http://svn.apache.org/r1496144
Log:
Merge r1492663 from trunk:
mod_cache_socache: Make sure the CacheSocacheMaxSize directive is merged
correctly.
Submitted by: minfrin
Reviewed/backported by: jim
Modified:
httpd/httpd/branches/2.4.x/ (props changed)
httpd/httpd/branches/2.4.x/CHANGES
httpd/httpd/branches/2.4.x/STATUS
httpd/httpd/branches/2.4.x/modules/cache/mod_cache_socache.c
Propchange: httpd/httpd/branches/2.4.x/
------------------------------------------------------------------------------
Merged /httpd/httpd/trunk:r1492663
Modified: httpd/httpd/branches/2.4.x/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/CHANGES?rev=1496144&r1=1496143&r2=1496144&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/CHANGES [utf-8] (original)
+++ httpd/httpd/branches/2.4.x/CHANGES [utf-8] Mon Jun 24 18:14:30 2013
@@ -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]
Modified: httpd/httpd/branches/2.4.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/STATUS?rev=1496144&r1=1496143&r2=1496144&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/STATUS (original)
+++ httpd/httpd/branches/2.4.x/STATUS Mon Jun 24 18:14:30 2013
@@ -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 ]
Modified: httpd/httpd/branches/2.4.x/modules/cache/mod_cache_socache.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/cache/mod_cache_socache.c?rev=1496144&r1=1496143&r2=1496144&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/cache/mod_cache_socache.c (original)
+++ httpd/httpd/branches/2.4.x/modules/cache/mod_cache_socache.c Mon Jun 24 18:14:30 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;
}