--------------------- PatchSet 11604 Date: 2007/08/31 13:48:23 Author: hno Branch: SQUID_2_6 Tag: (none) Log: MFC: Verify the URL on memory cache hits Merged changes: 2007/08/27 21:57:17 hno +6 -1 Verify the URL on memory cache hits Members: src/client_side.c:1.693.2.17->1.693.2.18 Index: squid/src/client_side.c =================================================================== RCS file: /cvsroot/squid/squid/src/client_side.c,v retrieving revision 1.693.2.17 retrieving revision 1.693.2.18 diff -u -r1.693.2.17 -r1.693.2.18 --- squid/src/client_side.c 31 Aug 2007 13:47:42 -0000 1.693.2.17 +++ squid/src/client_side.c 31 Aug 2007 13:48:23 -0000 1.693.2.18 @@ -1,6 +1,6 @@ /* - * $Id: client_side.c,v 1.693.2.17 2007/08/31 13:47:42 hno Exp $ + * $Id: client_side.c,v 1.693.2.18 2007/08/31 13:48:23 hno Exp $ * * DEBUG: section 33 Client-side Routines * AUTHOR: Duane Wessels @@ -2130,6 +2130,11 @@ } return; } + if (strcmp(mem->url, urlCanonical(r)) != 0) { + debug(33, 1) ("clientCacheHit: URL mismatch '%s' != '%s'?\n", e->mem_obj->url, urlCanonical(r)); + clientProcessMiss(http); + return; + } /* * Got the headers, now grok them */