Merge r1629508 from trunk:

mod_cache_socache: Change average object size
hint from 32 bytes to 2048 bytes.

Submitted by: rjung
Reviewed/backported by: jim


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1634528 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Jim Jagielski
2014-10-27 12:48:24 +00:00
parent 2ed96d5dfc
commit 1dbdeb51d1
3 changed files with 4 additions and 7 deletions

View File

@ -2,6 +2,9 @@
Changes with Apache 2.4.11
*) mod_cache_socache: Change average object size hint from 32 bytes to
2048 bytes. [Rainer Jung]
*) mod_cache_socache: Add cache status to server-status. [Rainer Jung]
*) event: Fix worker-listener deadlock in graceful restart.

6
STATUS
View File

@ -102,12 +102,6 @@ RELEASE SHOWSTOPPERS:
PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
[ start all new proposals below, under PATCHES PROPOSED. ]
* mod_cache_socache: Change average object size
hint from 32 bytes to 2048 bytes.
trunk patch: http://svn.apache.org/r1629508
2.4.x patch: trunk works modulo CHANGES
+1: rjung, covener, jim
* mod_ssl: Move OCSP stapling information to a per-server hash. PR 54357.
trunk patches: https://svn.apache.org/r1629372
https://svn.apache.org/r1629485

View File

@ -1450,7 +1450,7 @@ static int socache_post_config(apr_pool_t *pconf, apr_pool_t *plog,
apr_status_t rv;
const char *errmsg;
static struct ap_socache_hints socache_hints =
{ 64, 32, 60000000 };
{ 64, 2048, 60000000 };
for (s = base_server; s; s = s->next) {
cache_socache_conf *conf =