This is an automated email from the ASF dual-hosted git repository. zwoop pushed a commit to branch 8.1.x in repository https://gitbox.apache.org/repos/asf/trafficserver.git
The following commit(s) were added to refs/heads/8.1.x by this push: new 0edceb9 Handle immediate as inactivity timeout (#6689) 0edceb9 is described below commit 0edceb9fff5e67a60912f45ee45f673e7d1fc2b5 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 67094f8..f25f9bb 100644 --- a/iocore/net/UnixNetVConnection.cc +++ b/iocore/net/UnixNetVConnection.cc @@ -1162,6 +1162,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;