---------------------
PatchSet 11760 
Date: 2007/11/24 02:24:59
Author: adrian
Branch: HEAD
Tag: (none) 
Log:

update a client-side hit URL check to take store urls into account.

Members: 
	src/client_side.c:1.748->1.749 

Index: squid/src/client_side.c
===================================================================
RCS file: /cvsroot/squid/squid/src/client_side.c,v
retrieving revision 1.748
retrieving revision 1.749
diff -u -r1.748 -r1.749
--- squid/src/client_side.c	23 Nov 2007 11:06:46 -0000	1.748
+++ squid/src/client_side.c	24 Nov 2007 02:24:59 -0000	1.749
@@ -1,6 +1,6 @@
 
 /*
- * $Id: client_side.c,v 1.748 2007/11/23 11:06:46 hno Exp $
+ * $Id: client_side.c,v 1.749 2007/11/24 02:24:59 adrian Exp $
  *
  * DEBUG: section 33    Client-side Routines
  * AUTHOR: Duane Wessels
@@ -2193,8 +2193,8 @@
 	debug(33, 1) ("clientCacheHit: store URL mismatch '%s' != '%s'?\n", mem->store_url, r->store_url);
 	clientProcessMiss(http);
 	return;
-    } else if (strcmp(mem->url, urlCanonical(r)) != 0) {
-	debug(33, 1) ("clientCacheHit: URL mismatch '%s' != '%s'?\n", e->mem_obj->url, urlCanonical(r));
+    } else if ((!r->store_url) && (!mem->store_url) && strcmp(mem->url, urlCanonical(r)) != 0) {
+	debug(33, 1) ("clientCacheHit: (store url '%s'); URL mismatch '%s' != '%s'?\n", r->store_url, e->mem_obj->url, urlCanonical(r));
 	clientProcessMiss(http);
 	return;
     }