From 1dbdeb51d1133c1fc2e79d1ecca2821703ecf12f Mon Sep 17 00:00:00 2001 From: Jim Jagielski Date: Mon, 27 Oct 2014 12:48:24 +0000 Subject: [PATCH] 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 --- CHANGES | 3 +++ STATUS | 6 ------ modules/cache/mod_cache_socache.c | 2 +- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/CHANGES b/CHANGES index 326ffa85f54..7b7f2d1349e 100644 --- a/CHANGES +++ b/CHANGES @@ -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. diff --git a/STATUS b/STATUS index bf599cf79d2..c3cc519ff27 100644 --- a/STATUS +++ b/STATUS @@ -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 diff --git a/modules/cache/mod_cache_socache.c b/modules/cache/mod_cache_socache.c index 31f9f5e029f..6bd9466bd19 100644 --- a/modules/cache/mod_cache_socache.c +++ b/modules/cache/mod_cache_socache.c @@ -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 = -- 2.47.2