Commit cf192202 authored by Poul-Henning Kamp's avatar Poul-Henning Kamp Committed by Tollef Fog Heen

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.
parent 9d33363d
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
* Copyright (c) 2006 Varnish Software AS * Copyright (c) 2006 Varnish Software AS
* Copyright (c) 2007 OmniTI Computer Consulting, Inc. * Copyright (c) 2007 OmniTI Computer Consulting, Inc.
* Copyright (c) 2007 Theo Schlossnagle * Copyright (c) 2007 Theo Schlossnagle
* Copyright (c) 2010 UPLEX, Nils Goroll * Copyright (c) 2010-2012 UPLEX, Nils Goroll
* All rights reserved. * All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
...@@ -224,7 +224,8 @@ vca_main(void *arg) ...@@ -224,7 +224,8 @@ vca_main(void *arg)
*/ */
if (sp) { 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 */ /* we should have removed all sps whose timeout has passed */
assert(tmo > 0.0); assert(tmo > 0.0);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment