TS-4125: wrong non-active conditions check This closes #416
(cherry picked from commit c26952d95104067d45704d6c81eb3bc038fd2282) Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/41964ab7 Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/41964ab7 Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/41964ab7 Branch: refs/heads/6.1.x Commit: 41964ab7662741d71de46286b7db8fb9a557a60f Parents: c35ea7f Author: Oknet <[email protected]> Authored: Tue Jan 12 09:22:26 2016 -0800 Committer: Bryan Call <[email protected]> Committed: Tue Jan 12 09:23:52 2016 -0800 ---------------------------------------------------------------------- iocore/net/UnixNet.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafficserver/blob/41964ab7/iocore/net/UnixNet.cc ---------------------------------------------------------------------- diff --git a/iocore/net/UnixNet.cc b/iocore/net/UnixNet.cc index b3a7587..7e0948c 100644 --- a/iocore/net/UnixNet.cc +++ b/iocore/net/UnixNet.cc @@ -586,7 +586,7 @@ NetHandler::manage_active_queue() int total_idle_time = 0; int total_idle_count = 0; for (; vc != NULL; vc = vc_next) { - if ((vc->next_inactivity_timeout_at > now) || (vc->next_activity_timeout_at > now)) { + if ((vc->next_inactivity_timeout_at <= now) || (vc->next_activity_timeout_at <= now)) { _close_vc(vc, now, handle_event, closed, total_idle_time, total_idle_count); } if (max_connections_active_per_thread_in > active_queue_size) {
