trafficserver-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From zw...@apache.org
Subject [trafficserver] branch master updated: Fix inactivity_timeout canceling
Date Sat, 22 Apr 2017 21:07:15 GMT
This is an automated email from the ASF dual-hosted git repository.

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

The following commit(s) were added to refs/heads/master by this push:
       new  b34de98   Fix inactivity_timeout canceling
b34de98 is described below

commit b34de98360bc0efba9b2d35e808d20714751f361
Author: Masaori Koshiba <masaori@apple.com>
AuthorDate: Fri Apr 21 10:14:18 2017 +0900

    Fix inactivity_timeout canceling
---
 iocore/net/UnixNetVConnection.cc | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/iocore/net/UnixNetVConnection.cc b/iocore/net/UnixNetVConnection.cc
index b73bcb3..dc190d7 100644
--- a/iocore/net/UnixNetVConnection.cc
+++ b/iocore/net/UnixNetVConnection.cc
@@ -1514,9 +1514,10 @@ UnixNetVConnection::set_inactivity_timeout(ink_hrtime timeout_in)
 #else
   if (timeout_in == 0) {
     // set default inactivity timeout
-    inactivity_timeout_in = timeout_in = HRTIME_SECONDS(nh->default_inactivity_timeout);
+    timeout_in = HRTIME_SECONDS(nh->default_inactivity_timeout);
   }
-  next_inactivity_timeout_at = Thread::get_hrtime() + timeout_in;
+  inactivity_timeout_in      = timeout_in;
+  next_inactivity_timeout_at = Thread::get_hrtime() + inactivity_timeout_in;
 #endif
 }
 

-- 
To stop receiving notification emails like this one, please contact
['"commits@trafficserver.apache.org" <commits@trafficserver.apache.org>'].

Mime
View raw message