From b88326b6bdd3678e36369afed0046f2a6f3c6360 Mon Sep 17 00:00:00 2001 From: Masaori Koshiba Date: Fri, 21 Apr 2017 10:14:18 +0900 Subject: [PATCH] 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 b73bcb3c09a..dc190d7935c 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 }