Skip to content

Handle immediate as inactivity timeout #6689

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
shinrich merged 1 commit into from
Jun 10, 2020
Merged

Handle immediate as inactivity timeout #6689

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions iocore/net/UnixNetVConnection.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down