From 60603805509e17c1b4546c13b792b17c1d53096a Mon Sep 17 00:00:00 2001 From: Thomas Porzelt Date: Sat, 12 Jun 2010 13:42:23 +0200 Subject: [PATCH] [core] Small fix for keepalive handling --- src/main/connection.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/main/connection.c b/src/main/connection.c index c8264e0..9953585 100644 --- a/src/main/connection.c +++ b/src/main/connection.c @@ -595,7 +595,10 @@ static void li_connection_reset_keep_alive(liConnection *con) { li_worker_con_put(con); return; } - if (con->keep_alive_data.max_idle >= con->srv->keep_alive_queue_timeout) { + + con->keep_alive_data.timeout = ev_now(con->wrk->loop) + con->keep_alive_data.max_idle; + + if (con->keep_alive_data.max_idle == con->srv->keep_alive_queue_timeout) { /* queue is sorted by con->keep_alive_data.timeout */ gboolean need_start = (0 == con->wrk->keep_alive_queue.length); con->keep_alive_data.timeout = ev_now(con->wrk->loop) + con->srv->keep_alive_queue_timeout;