---------------------
PatchSet 11786 
Date: 2007/11/26 13:12:36
Author: adrian
Branch: HEAD
Tag: (none) 
Log:
Author: adrian
Pre-storeurl objects in the cache may be hit on storeurl lookups; allow these if valid.

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

Index: squid/src/client_side.c
===================================================================
RCS file: /cvsroot/squid/squid/src/client_side.c,v
retrieving revision 1.749
retrieving revision 1.750
diff -u -r1.749 -r1.750
--- squid/src/client_side.c	24 Nov 2007 02:24:59 -0000	1.749
+++ squid/src/client_side.c	26 Nov 2007 13:12:36 -0000	1.750
@@ -1,6 +1,6 @@
 
 /*
- * $Id: client_side.c,v 1.749 2007/11/24 02:24:59 adrian Exp $
+ * $Id: client_side.c,v 1.750 2007/11/26 13:12:36 adrian Exp $
  *
  * DEBUG: section 33    Client-side Routines
  * AUTHOR: Duane Wessels
@@ -2185,8 +2185,8 @@
     debug(33, 3) ("clientCacheHit: %s = %d\n", http->uri, rep->sline.status);
     assert(!EBIT_TEST(e->flags, ENTRY_ABORTED));
 
-    if (r->store_url && mem->store_url == NULL) {
-	debug(33, 1) ("clientCacheHit: request has store_url '%s'; mem object in hit doesn't!\n", r->store_url);
+    if (r->store_url && mem->store_url == NULL && strcmp(r->store_url, mem->url) != 0) {
+	debug(33, 1) ("clientCacheHit: request has store_url '%s'; mem object in hit doesn't and doesn't match the url '%s'!\n", r->store_url, mem->url);
 	clientProcessMiss(http);
 	return;
     } else if (r->store_url && strcmp(mem->store_url, r->store_url) != 0) {