head	1.2;
access;
symbols
	old_RELEASE_7_0_0:1.1
	old_RELEASE_6_3_0:1.1;
locks; strict;
comment	@# @;


1.2
date	2007.12.20.14.09.53;	author des;	state dead;
branches;
next	1.1;

1.1
date	2007.08.29.15.45.47;	author des;	state Exp;
branches;
next	;


desc
@@


1.2
log
@Upgrade to 1.1.2.
@
text
@Index: bin/varnishd/cache_center.c
===================================================================
--- bin/varnishd/cache_center.c	(revision 1912)
+++ bin/varnishd/cache_center.c	(revision 1913)
@@@@ -524,7 +524,12 @@@@
 		 */
 		WSL(sp->wrk, SLT_Debug, sp->fd,
 		    "on waiting list on obj %u", sp->obj->xid);
-		assert(!isnan(sp->wrk->used));
+		/*
+		 * There is a non-zero risk that we come here more than once
+		 * before we get through, in that case cnt_recv must be set
+		 */
+		if (isnan(sp->wrk->used))
+			sp->wrk->used = TIM_real();
 		SES_Charge(sp);
 		return (1);
 	}
@


1.1
log
@Apply patch for Varnish bug #150.
@
text
@@

