Skip to content

Fix crash in open_close_h2 (#7586) #7889

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
zwoop merged 1 commit into from
May 27, 2021
Merged

Fix crash in open_close_h2 (#7586) #7889

Show file tree
Hide file tree
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
7 changes: 2 additions & 5 deletions proxy/http/HttpSM.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -384,11 +384,8 @@ HttpSM::state_add_to_list(int event, void * /* data ATS_UNUSED */)
if (ua_entry->read_vio) {
// Seems like ua_entry->read_vio->disable(); should work, but that was
// not sufficient to stop the state machine from processing IO events until the
// TXN_START hooks had completed
// Preserve the current read cont and mutex
NetVConnection *netvc = ((ProxyTransaction *)ua_entry->vc)->get_netvc();
ink_assert(netvc != nullptr);
ua_entry->read_vio = ua_entry->vc->do_io_read(netvc->read_vio_cont(), 0, nullptr);
// TXN_START hooks had completed. Just set the number of bytes to read to 0
ua_entry->read_vio = ua_entry->vc->do_io_read(this, 0, nullptr);
}
return EVENT_CONT;
}
Expand Down
13 changes: 8 additions & 5 deletions proxy/http2/Http2Stream.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,11 +194,14 @@ Http2Stream::send_request(Http2ConnectionState &cstate)
return;
}

if (this->recv_end_stream) {
this->read_vio.nbytes = bufindex;
this->signal_read_event(VC_EVENT_READ_COMPLETE);
} else {
this->signal_read_event(VC_EVENT_READ_READY);
// Is the _sm ready to process the header?
if (this->read_vio.nbytes > 0) {
if (this->recv_end_stream) {
this->read_vio.nbytes = bufindex;
this->signal_read_event(VC_EVENT_READ_COMPLETE);
} else {
this->signal_read_event(VC_EVENT_READ_READY);
}
}
}

Expand Down