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 2014/05/19 16:53:02 UTC
svn commit: r1595918 - in /httpd/httpd/branches/2.4.x: ./ CHANGES STATUS
modules/cache/mod_socache_shmcb.c
Author: jim
Date: Mon May 19 14:53:01 2014
New Revision: 1595918
URL: http://svn.apache.org/r1595918
Log:
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
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_socache_shmcb.c
Propchange: httpd/httpd/branches/2.4.x/
------------------------------------------------------------------------------
Merged /httpd/httpd/trunk:r1595426
Modified: httpd/httpd/branches/2.4.x/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/CHANGES?rev=1595918&r1=1595917&r2=1595918&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/CHANGES [utf-8] (original)
+++ httpd/httpd/branches/2.4.x/CHANGES [utf-8] Mon May 19 14:53:01 2014
@@ -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].
Modified: httpd/httpd/branches/2.4.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/STATUS?rev=1595918&r1=1595917&r2=1595918&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/STATUS (original)
+++ httpd/httpd/branches/2.4.x/STATUS Mon May 19 14:53:01 2014
@@ -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:
Modified: httpd/httpd/branches/2.4.x/modules/cache/mod_socache_shmcb.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/cache/mod_socache_shmcb.c?rev=1595918&r1=1595917&r2=1595918&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/cache/mod_socache_shmcb.c (original)
+++ httpd/httpd/branches/2.4.x/modules/cache/mod_socache_shmcb.c Mon May 19 14:53:01 2014
@@ -868,6 +868,7 @@ static int shmcb_subcache_retrieve(serve
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_itera
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");
}