[trafficserver] 03/03: Fix inactivity_timeout canceling

[zw...@apache.org]

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

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

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

    Fix inactivity_timeout canceling
    
    (cherry picked from commit b34de98360bc0efba9b2d35e808d20714751f361)
---
 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 81bfde2..79cc756 100644
--- a/iocore/net/UnixNetVConnection.cc
+++ b/iocore/net/UnixNetVConnection.cc
@@ -1513,9 +1513,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" <co...@trafficserver.apache.org>.