[trafficserver] branch 9.2.x updated: Fix timeout checks of NetHandler::manage_active_queue() (#8287)

[zw...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

zwoop pushed a commit to branch 9.2.x
in repository https://gitbox.apache.org/repos/asf/trafficserver.git


The following commit(s) were added to refs/heads/9.2.x by this push:
     new 295e2dd  Fix timeout checks of NetHandler::manage_active_queue() (#8287)
295e2dd is described below

commit 295e2dd686d6f5e0ad8f246d238da81d77f430ea
Author: Masaori Koshiba <ma...@apache.org>
AuthorDate: Fri Oct 22 08:17:06 2021 +0900

    Fix timeout checks of NetHandler::manage_active_queue() (#8287)
    
    (cherry picked from commit 5e5375808e488654579dff4097c3db0b71651178)
---
 iocore/net/UnixNet.cc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/iocore/net/UnixNet.cc b/iocore/net/UnixNet.cc
index 019bcaa..07a63ea 100644
--- a/iocore/net/UnixNet.cc
+++ b/iocore/net/UnixNet.cc
@@ -603,8 +603,8 @@ NetHandler::manage_active_queue(NetEvent *enabling_ne, bool ignore_queue_size =
     if (ne == enabling_ne) {
       continue;
     }
-    if ((ne->inactivity_timeout_in && ne->next_inactivity_timeout_at <= now) ||
-        (ne->active_timeout_in && ne->next_activity_timeout_at <= now)) {
+    if ((ne->next_inactivity_timeout_at && ne->next_inactivity_timeout_at <= now) ||
+        (ne->next_activity_timeout_at && ne->next_activity_timeout_at <= now)) {
       _close_ne(ne, now, handle_event, closed, total_idle_time, total_idle_count);
     }
     if (ignore_queue_size == false && max_requests_per_thread_in > active_queue_size) {