[master] 5b8d896 By Slink, via Geoff:
Poul-Henning Kamp
phk at varnish-cache.org
Sun Jan 15 20:31:42 CET 2012
commit 5b8d8964491a85d06c5c496d8242bd6dfa14ec7e
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/waiter/cache_waiter_ports.c b/bin/varnishd/waiter/cache_waiter_ports.c
index 4f39ca4..87eaeac 100644
--- a/bin/varnishd/waiter/cache_waiter_ports.c
+++ b/bin/varnishd/waiter/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
@@ -220,7 +220,7 @@ vws_thread(void *priv)
if (sp) {
double tmo =
- (sp->t_open + cache_param->timeout_idle) - now;
+ (sp->t_idle + cache_param->timeout_idle) - now;
/*
* we should have removed all sps whose timeout
More information about the varnish-commit
mailing list