From 2215f8c8a89ebef74e706e8b275ab29413e554ae Mon Sep 17 00:00:00 2001 From: Bryan Call Date: Sat, 30 Jan 2016 10:46:46 -0800 Subject: [PATCH] TS-4168: Only close inactive and active connections that have a non-zero timeout --- iocore/net/UnixNet.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/iocore/net/UnixNet.cc b/iocore/net/UnixNet.cc index b616f4a55d9..4614ac7fdfa 100644 --- a/iocore/net/UnixNet.cc +++ b/iocore/net/UnixNet.cc @@ -592,7 +592,7 @@ NetHandler::manage_active_queue(bool ignore_queue_size = false) int total_idle_count = 0; for (; vc != NULL; vc = vc_next) { vc_next = vc->active_queue_link.next; - if ((vc->next_inactivity_timeout_at <= now) || (vc->next_activity_timeout_at <= now)) { + if ((vc->inactivity_timeout_in && vc->next_inactivity_timeout_at <= now) || (vc->active_timeout_in && vc->next_activity_timeout_at <= now)) { _close_vc(vc, now, handle_event, closed, total_idle_time, total_idle_count); } if (ignore_queue_size == false && max_connections_active_per_thread_in > active_queue_size) {