--------------------- PatchSet 5826 Date: 2003/07/13 22:30:01 Author: hno Branch: collapsed_forwarding-2_5 Tag: (none) Log: Fix "collapsed request STALE" trigger. Was looking into the wrong object. Members: src/client_side.c:1.47.2.31.4.9->1.47.2.31.4.10 Index: squid/src/client_side.c =================================================================== RCS file: /cvsroot/squid-sf//squid/src/client_side.c,v retrieving revision 1.47.2.31.4.9 retrieving revision 1.47.2.31.4.10 diff -u -r1.47.2.31.4.9 -r1.47.2.31.4.10 --- squid/src/client_side.c 13 Jul 2003 19:54:09 -0000 1.47.2.31.4.9 +++ squid/src/client_side.c 13 Jul 2003 22:30:01 -0000 1.47.2.31.4.10 @@ -1,6 +1,6 @@ /* - * $Id: client_side.c,v 1.47.2.31.4.9 2003/07/13 19:54:09 hno Exp $ + * $Id: client_side.c,v 1.47.2.31.4.10 2003/07/13 22:30:01 hno Exp $ * * DEBUG: section 33 Client-side Routines * AUTHOR: Duane Wessels @@ -399,7 +399,7 @@ if (EBIT_TEST(entry->flags, ENTRY_ABORTED)) { debug(33, 1) ("clientProcessExpired: collapsed request ABORTED!\n"); entry = NULL; - } else if (entry->mem_obj->ims_timestamp + 30 < squid_curtime) { + } else if (http->entry->mem_obj->ims_timestamp + 30 < squid_curtime) { debug(33, 1) ("clientProcessExpired: collapsed request STALE!\n"); entry = NULL; }