httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@apache.org
Subject svn commit: r1750846 - in /httpd/httpd/branches/2.2.x: CHANGES STATUS modules/cache/mod_mem_cache.c
Date Thu, 30 Jun 2016 17:47:48 GMT
Author: wrowe
Date: Thu Jun 30 17:47:48 2016
New Revision: 1750846

URL: http://svn.apache.org/viewvc?rev=1750846&view=rev
Log:
mod_mem_cache: Fix concurrent removal of stale entries which could lead
to a crash. 

PR: 43724
Submitted by: ylavic
Reviewed by: covener, wrowe

Modified:
    httpd/httpd/branches/2.2.x/CHANGES
    httpd/httpd/branches/2.2.x/STATUS
    httpd/httpd/branches/2.2.x/modules/cache/mod_mem_cache.c

Modified: httpd/httpd/branches/2.2.x/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/CHANGES?rev=1750846&r1=1750845&r2=1750846&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/CHANGES [utf-8] (original)
+++ httpd/httpd/branches/2.2.x/CHANGES [utf-8] Thu Jun 30 17:47:48 2016
@@ -12,6 +12,9 @@ Changes with Apache 2.2.32
      to avoid reusing it should the close be effective after some new request
      is ready to be sent.  [Yann Ylavic]
 
+  *) mod_mem_cache: Fix concurrent removal of stale entries which could lead
+     to a crash.  PR 43724.  [Yann Ylavic]
+
   *) mime.types: add common extension "m4a" for MPEG 4 Audio.
      PR 57895 [Dylan Millikin <dylan.millikin gmail.com>]
 

Modified: httpd/httpd/branches/2.2.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/STATUS?rev=1750846&r1=1750845&r2=1750846&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/STATUS (original)
+++ httpd/httpd/branches/2.2.x/STATUS Thu Jun 30 17:47:48 2016
@@ -103,11 +103,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-  *) mod_mem_cache: Fix concurrent removal of stale entries which could lead
-                    to a crash. PR 43724.
-     trunk patch: not applicable (2.2.x only)
-     2.2.x patch: http://home.apache.org/~ylavic/patches/httpd-2.2.x-mod_mem_cache-pr43724.patch
-     +1: ylavic, covener, wrowe
 
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:

Modified: httpd/httpd/branches/2.2.x/modules/cache/mod_mem_cache.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/modules/cache/mod_mem_cache.c?rev=1750846&r1=1750845&r2=1750846&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/modules/cache/mod_mem_cache.c (original)
+++ httpd/httpd/branches/2.2.x/modules/cache/mod_mem_cache.c Thu Jun 30 17:47:48 2016
@@ -537,7 +537,7 @@ static int remove_url(cache_handle_t *h,
     }
 
     obj = h->cache_obj;
-    if (obj) {
+    if (obj && cache_find(sconf->cache_cache, obj->key) == obj) {
         cache_remove(sconf->cache_cache, obj);
         /* For performance, cleanup cache object after releasing the lock */
         cleanup = !apr_atomic_dec32(&obj->refcount);



Mime
View raw message