From: hno <>
Date: Tue, 30 May 2000 15:24:34 +0000 (+0000)
Subject: hno squid-2.4.DEVEL3-hno.devel.MD5_mismatch_warning.patch
X-Git-Tag: SQUID_3_0_PRE1~1951
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e7407eb85024a0fb34667ab6134623924aab23ef;p=thirdparty%2Fsquid.git

hno squid-2.4.DEVEL3-hno.devel.MD5_mismatch_warning.patch

Fixes some bogous bogous MD5 key mismatch warnings when using
the aufs or diskd stores. This is due to their asyncronous nature where
objects might get removed from the cache while they are being read from
disk.

Also rearranged the ChangeLog somewhat since Duane apparently have made
an internal Squid-2.4.DEVEL3 release..
---

diff --git a/ChangeLog b/ChangeLog
index a03c596d8a..6079e7ebc9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,9 +1,6 @@
 
-Changes to Squid-2.4.DEVEL3 ():
+Changes to Squid ():
 
-	- Added Logfile module.
-	- Added DISKD stats via cachemgr.
-	- Added squid.conf options for DISKD magic constants.
 	- Added --enable-auth-modules=... configure option
 	- Improved ICP dead peer detection to also work when the workload
 	  is low
@@ -61,8 +58,16 @@ Changes to Squid-2.4.DEVEL3 ():
 	  a more modular fashion. The object replacement and IO is now
 	  responsibility of the storage directory, and not of the storage
 	  manager.
+	- Fixed a bogous MD5 mismatch warning sometimes seen when using
+	  aufs or diskd stores
+
+Changes to Squid-2.4.DEVEL3 ():
+
+	- Added Logfile module.
+	- Added DISKD stats via cachemgr.
+	- Added squid.conf options for DISKD magic constants.
 
-Changes to Squid-2.4.DEVEL2 ():
+Changes to Squid-2.4.DEVEL2 (Feb 29, 2000):
 
 Changes to Squid-2.4.DEVEL1 ():
 
diff --git a/src/store_client.cc b/src/store_client.cc
index 5bdaf27b29..b85c8775f6 100644
--- a/src/store_client.cc
+++ b/src/store_client.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: store_client.cc,v 1.91 2000/05/28 17:35:04 wessels Exp $
+ * $Id: store_client.cc,v 1.92 2000/05/30 09:24:35 hno Exp $
  *
  * DEBUG: section 20    Storage Manager Client-Side Interface
  * AUTHOR: Duane Wessels
@@ -408,10 +408,12 @@ storeClientReadHeader(void *data, const char *buf, ssize_t len)
 	switch (t->type) {
 	case STORE_META_KEY:
 	    assert(t->length == MD5_DIGEST_CHARS);
-	    if (memcmp(t->value, e->key, MD5_DIGEST_CHARS)) {
+	    if (!EBIT_TEST(e->flags, KEY_PRIVATE) &&
+		    memcmp(t->value, e->key, MD5_DIGEST_CHARS)) {
 		debug(20, 1) ("WARNING: swapin MD5 mismatch\n");
 		debug(20, 1) ("\t%s\n", storeKeyText(t->value));
 		debug(20, 1) ("\t%s\n", storeKeyText(e->key));
+		swap_object_ok = 0;
 	    }
 	    break;
 	case STORE_META_URL: