This is an automated email from the ASF dual-hosted git repository. zwoop pushed a commit to branch 9.0.x in repository https://gitbox.apache.org/repos/asf/trafficserver.git
The following commit(s) were added to refs/heads/9.0.x by this push: new 67fa91c Handle immediate as inactivity timeout (#6689) 67fa91c is described below commit 67fa91c1c01c8e81921bc292d222d7676ecb56a8 Author: Susan Hinrichs <shinr...@yahoo-inc.com> AuthorDate: Wed Jun 10 15:46:29 2020 -0500 Handle immediate as inactivity timeout (#6689) Co-authored-by: Susan Hinrichs <shinr...@verizonmedia.com> (cherry picked from commit 35aa4cea1b94862eef33cba5b169af33bbdac3a3) --- iocore/net/UnixNetVConnection.cc | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/iocore/net/UnixNetVConnection.cc b/iocore/net/UnixNetVConnection.cc index 181420e..163b58f 100644 --- a/iocore/net/UnixNetVConnection.cc +++ b/iocore/net/UnixNetVConnection.cc @@ -1126,6 +1126,11 @@ UnixNetVConnection::mainEvent(int event, Event *e) Event **signal_timeout = &t; switch (event) { + // Treating immediate as inactivity timeout for any + // deprecated remaining immediates. The previous code was using EVENT_INTERVAL + // and EVENT_IMMEDIATE to distinguish active and inactive timeouts. + // There appears to be some stray EVENT_IMMEDIATEs floating around + case EVENT_IMMEDIATE: case VC_EVENT_INACTIVITY_TIMEOUT: signal_event = VC_EVENT_INACTIVITY_TIMEOUT; signal_timeout_at = &next_inactivity_timeout_at;