Repository: trafficserver Updated Branches: refs/heads/6.1.x 70fd4a226 -> a80b4f3c5
TS-4168: Only close inactive and active connections that have This closes #447 (cherry picked from commit 29c25d7decc72af51ba57c29b1d5663ae2357c13) Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/a80b4f3c Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/a80b4f3c Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/a80b4f3c Branch: refs/heads/6.1.x Commit: a80b4f3c5cb5436fa8fa2ea9a08261f46627e2e5 Parents: 70fd4a2 Author: Bryan Call <[email protected]> Authored: Mon Feb 1 11:20:25 2016 -0800 Committer: Bryan Call <[email protected]> Committed: Mon Feb 1 11:24:33 2016 -0800 ---------------------------------------------------------------------- iocore/net/UnixNet.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafficserver/blob/a80b4f3c/iocore/net/UnixNet.cc ---------------------------------------------------------------------- diff --git a/iocore/net/UnixNet.cc b/iocore/net/UnixNet.cc index b616f4a..aec2703 100644 --- a/iocore/net/UnixNet.cc +++ b/iocore/net/UnixNet.cc @@ -592,7 +592,8 @@ 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) {
