From: Rainer Jung <rjung@apache.org>
Date: Sat, 17 May 2014 06:01:35 +0000 (+0000)
Subject: mod_socache_shmcb: Correct counting of expirations for status display.
X-Git-Tag: 2.5.0-alpha~4192
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=acd15709aac4c1b5bc1655f8111dbbf8d93ba33f;p=apache

mod_socache_shmcb: Correct counting of expirations for status display.
Expirations happening during retrieval were not counted.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1595426 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/CHANGES b/CHANGES
index e87e784ab6..841309b746 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,9 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache 2.5.0
 
+  *) mod_socache_shmcb: Correct counting of expirations for status display.
+     Expirations happening during retrieval were not counted. [Rainer Jung]
+
   *) mod_proxy_balancer: Correctly encode user provided data in management
      interface. PR 56532 [Maksymilian, <max cert.cx>]
 
diff --git a/modules/cache/mod_socache_shmcb.c b/modules/cache/mod_socache_shmcb.c
index a2e56a1015..706c2f74f6 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");
             }