From: Henrik Nordstrom <henrik@henriknordstrom.net>
Date: Mon, 27 Jul 2009 21:48:18 +0000 (+0200)
Subject: Correct mem positioning of swapped in data
X-Git-Tag: SQUID_3_2_0_1~795^2~17
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=619da1e;p=thirdparty%2Fsquid.git

Correct mem positioning of swapped in data
---

diff --git a/src/store_client.cc b/src/store_client.cc
index e951bab6f1..b98c8ff21c 100644
--- a/src/store_client.cc
+++ b/src/store_client.cc
@@ -510,7 +510,7 @@ store_client::readBody(const char *buf, ssize_t len)
              * cache expects offset without headers (using negative for headers)
              * eventually not storing packed headers in memory at all.
              */
-            int64_t mem_offset = entry->mem_obj->endOffset() + rep->hdr_sz;
+            int64_t mem_offset = entry->mem_obj->endOffset();
             if ((copyInto.offset == mem_offset) || (parsed_header && mem_offset == rep->hdr_sz)) {
                 entry->mem_obj->write(StoreIOBuffer(len, copyInto.offset - rep->hdr_sz, copyInto.data), storeClientMemWriteComplete, this);
             }