[trafficserver] branch master updated: Make TSVConnInacitivityTimeoutCancel work as expected.

[shinrich]

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

shinrich 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 7d3446f  Make TSVConnInacitivityTimeoutCancel work as expected.
7d3446f is described below

commit 7d3446f052839a241ad42f8a55dada579cb4315f
Author: Susan Hinrichs <shinr...@oath.com>
AuthorDate: Wed Jul 10 13:55:29 2019 +0000

    Make TSVConnInacitivityTimeoutCancel work as expected.
---
 iocore/net/P_UnixNetVConnection.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/iocore/net/P_UnixNetVConnection.h 
b/iocore/net/P_UnixNetVConnection.h
index 5bea212..a5620cc 100644
--- a/iocore/net/P_UnixNetVConnection.h
+++ b/iocore/net/P_UnixNetVConnection.h
@@ -386,8 +386,8 @@ inline void
 UnixNetVConnection::cancel_inactivity_timeout()
 {
   Debug("socket", "Cancel inactive timeout for NetVC=%p", this);
-  inactivity_timeout_in = 0;
-  set_inactivity_timeout(0);
+  inactivity_timeout_in      = 0;
+  next_inactivity_timeout_at = 0;
 }
 
 inline void