r1568 - trunk/varnish-cache/bin/varnishd

[des at projects.linpro.no]

Author: des
Date: 2007-06-25 18:24:18 +0200 (Mon, 25 Jun 2007)
New Revision: 1568

Modified:
   trunk/varnish-cache/bin/varnishd/cache_hash.c
Log:
Avoid an assertion failure by not calling EXP_TTLChange() for objects which
are not on the expiry heap.


Modified: trunk/varnish-cache/bin/varnishd/cache_hash.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_hash.c	2007-06-25 15:54:22 UTC (rev 1567)
+++ trunk/varnish-cache/bin/varnishd/cache_hash.c	2007-06-25 16:24:18 UTC (rev 1568)
@@ -157,7 +157,8 @@
 		} else if (BAN_CheckObject(o, h->hd[HTTP_HDR_URL].b)) {
 			o->ttl = 0;
 			VSL(SLT_ExpBan, 0, "%u was banned", o->xid);
-			EXP_TTLchange(o);
+			if (o->heap_idx != 0)
+				EXP_TTLchange(o);
 		} else if (o->vary == NULL || VRY_Match(sp, o->vary))
 			break;
 		o->refcnt--;