From f76c5ef05be8be4adc593e979b07f7c04e1a826f Mon Sep 17 00:00:00 2001 From: Jim Jagielski Date: Mon, 19 May 2014 14:53:01 +0000 Subject: [PATCH] Merge r1595426 from trunk: mod_socache_shmcb: Correct counting of expirations for status display. Expirations happening during retrieval were not counted. Submitted by: rjung Reviewed/backported by: jim git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1595918 13f79535-47bb-0310-9956-ffa450edef68 --- CHANGES | 3 +++ STATUS | 5 ----- modules/cache/mod_socache_shmcb.c | 2 ++ 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/CHANGES b/CHANGES index aa74d02f62..c3920e6586 100644 --- a/CHANGES +++ b/CHANGES @@ -2,6 +2,9 @@ Changes with Apache 2.4.10 + *) mod_socache_shmcb: Correct counting of expirations for status display. + Expirations happening during retrieval were not counted. [Rainer Jung] + *) mod_cache: Retry unconditional request with the full URL (including the query-string) when the origin server's 304 response does not match the conditions used to revalidate the stale entry. [Yann Ylavic]. diff --git a/STATUS b/STATUS index 3ed5f48ba7..5483c244be 100644 --- a/STATUS +++ b/STATUS @@ -100,11 +100,6 @@ RELEASE SHOWSTOPPERS: PATCHES ACCEPTED TO BACKPORT FROM TRUNK: [ start all new proposals below, under PATCHES PROPOSED. ] - * mod_socache_shmcb: Correct counting of expirations for status display. - Expirations happening during retrieval were not counted. - trunk patch: http://svn.apache.org/r1595426 - 2.4.x patch: trunk works (modulo CHANGES) - +1: rjung, trawick, ylavic PATCHES PROPOSED TO BACKPORT FROM TRUNK: diff --git a/modules/cache/mod_socache_shmcb.c b/modules/cache/mod_socache_shmcb.c index a916431160..4e8937750c 100644 --- a/modules/cache/mod_socache_shmcb.c +++ b/modules/cache/mod_socache_shmcb.c @@ -868,6 +868,7 @@ static int shmcb_subcache_retrieve(server_rec *s, SHMCBHeader *header, else { /* Already stale, quietly remove and treat as not-found */ idx->removed = 1; + header->stat_expiries++; ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s, APLOGNO(00850) "shmcb_subcache_retrieve discarding expired entry"); return -1; @@ -991,6 +992,7 @@ static apr_status_t shmcb_subcache_iterate(ap_socache_instance_t *instance, else { /* Already stale, quietly remove and treat as not-found */ idx->removed = 1; + header->stat_expiries++; ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s, APLOGNO(00856) "shmcb_subcache_iterate discarding expired entry"); } -- 2.40.0