[3.0] cf19220 By Slink, via Geoff:

[Tollef Fog Heen]

commit cf192202f9801fff9c689b15eb3e4c2768feb8bf
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Sun Jan 15 19:30:53 2012 +0000

    By Slink, via Geoff:
    
    The attached patch is a one-liner for waiter/cache_waiter_ports.c,
    the code was referencing sp->t_open where it should have been
    sp->t_idle, which was causing assertion failures on idle session
    timeouts.

diff --git a/bin/varnishd/cache_waiter_ports.c b/bin/varnishd/cache_waiter_ports.c
index 9ee3aea..e26a80c 100644
--- a/bin/varnishd/cache_waiter_ports.c
+++ b/bin/varnishd/cache_waiter_ports.c
@@ -3,7 +3,7 @@
  * Copyright (c) 2006 Varnish Software AS
  * Copyright (c) 2007 OmniTI Computer Consulting, Inc.
  * Copyright (c) 2007 Theo Schlossnagle
- * Copyright (c) 2010 UPLEX, Nils Goroll
+ * Copyright (c) 2010-2012 UPLEX, Nils Goroll
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -224,7 +224,8 @@ vca_main(void *arg)
 		 */
 
 		if (sp) {
-			double tmo = (sp->t_open + params->sess_timeout) - now;
+			double tmo =
+			    (sp->t_end + cache_param->timeout_idle) - now;
 
 			/* we should have removed all sps whose timeout has passed */
 			assert(tmo > 0.0);