From: Alex Rousskov <rousskov@measurement-factory.com>
Date: Mon, 29 Jul 2013 00:27:23 +0000 (-0600)
Subject: Improved STORE_MEM_CLIENT detection.
X-Git-Tag: SQUID_3_5_0_1~444^2~22
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a96fb63db6910a05e64716741f452e93d9060c7b;p=thirdparty%2Fsquid.git

Improved STORE_MEM_CLIENT detection.

IN_MEMORY mem_status does not guarantee that the entore object is in the
memory cache. We may be just loading it from a shared memrory cache, and
loading may fail. We may have nibbled at the entry already (although that may
not be possible, not sure). The whole memory/disk store_client designation
probably needs more work, but the now-removed condition was causing
store_client.cc:445: "STORE_DISK_CLIENT == getType()" assertions.
---

diff --git a/src/store.cc b/src/store.cc
index b1004cd483..20d9582468 100644
--- a/src/store.cc
+++ b/src/store.cc
@@ -318,11 +318,6 @@ StoreEntry::storeClientType() const
      * offset 0 in the memory object is the HTTP headers.
      */
 
-    if (mem_status == IN_MEMORY && Config.memShared && IamWorkerProcess()) {
-        // clients of an object cached in shared memory are memory clients
-        return STORE_MEM_CLIENT;
-    }
-
     assert(mem_obj);
 
     if (mem_obj->inmem_lo)