You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by bc...@apache.org on 2016/02/01 20:21:39 UTC
trafficserver git commit: TS-4168: Only close inactive and active
connections that have
Repository: trafficserver
Updated Branches:
refs/heads/master 37bab96c6 -> 29c25d7de
TS-4168: Only close inactive and active connections that have
This closes #447
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/29c25d7d
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/29c25d7d
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/29c25d7d
Branch: refs/heads/master
Commit: 29c25d7decc72af51ba57c29b1d5663ae2357c13
Parents: 37bab96
Author: Bryan Call <bc...@apache.org>
Authored: Mon Feb 1 11:20:25 2016 -0800
Committer: Bryan Call <bc...@apache.org>
Committed: Mon Feb 1 11:20:25 2016 -0800
----------------------------------------------------------------------
iocore/net/UnixNet.cc | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/29c25d7d/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) {