Skip to content

Fix for HTTP/2 frames #7965

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
bryancall merged 1 commit into from
Jun 21, 2021
Merged

Fix for HTTP/2 frames #7965

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
14 changes: 7 additions & 7 deletions proxy/http2/Http2ClientSession.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,11 +84,6 @@ Http2ClientSession::destroy()
void
Http2ClientSession::free()
{
if (this->_reenable_event) {
this->_reenable_event->cancel();
this->_reenable_event = nullptr;
}

if (_vc) {
_vc->do_io_close();
_vc = nullptr;
Expand All @@ -105,6 +100,11 @@ Http2ClientSession::free()
REMEMBER(NO_EVENT, this->recursion)
Http2SsnDebug("session free");

if (this->_reenable_event) {
this->_reenable_event->cancel();
this->_reenable_event = nullptr;
}

// Don't free active ProxySession
ink_release_assert(is_active() == false);

Expand Down Expand Up @@ -620,8 +620,8 @@ Http2ClientSession::remember(const SourceLocation &location, int event, int reen
bool
Http2ClientSession::_should_do_something_else()
{
// Do something else every 128 incoming frames
return (this->_n_frame_read & 0x7F) == 0;
// Do something else every 128 incoming frames if connection state isn't closed
return (this->_n_frame_read & 0x7F) == 0 && !connection_state.is_state_closed();
}

sockaddr const *
Expand Down