OSSForks/node
1
0
Fork 0
mirror of https://github.com/zebrajr/node.git synced 2025-12-06 12:20:27 +01:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

http2: on receiving rst_stream with cancel code add it to pending list

Browse Source 
PR-URL: https://github.com/nodejs/node/pull/39423
Backport-PR-URL: https://github.com/nodejs/node/pull/39527
Fixes: https://github.com/nodejs/node/issues/38964
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
This commit is contained in:
Akshay K 2021-07-26 08:21:51 -04:00 committed by Richard Lau
parent e11a862eed
commit b263f2585a
No known key found for this signature in database
GPG Key ID: C43CEC45C17AB93C
2 changed files with 33 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/node_http2.cc
View File

@ -2150,6 +2150,23 @@ int Http2Stream::SubmitPriority(nghttp2_priority_spec* prispec,
void Http2Stream::SubmitRstStream(const uint32_t code) {
CHECK(!this->IsDestroyed());
code_ = code;
// If RST_STREAM frame is received and stream is not writable
// because it is busy reading data, don't try force purging it.
// Instead add the stream to pending stream list and process
// the pending data when it is safe to do so. This is to avoid
// double free error due to unwanted behavior of nghttp2.
// Ref:https://github.com/nodejs/node/issues/38964
// Add stream to the pending list if it is received with scope
// below in the stack. The pending list may not get processed
// if RST_STREAM received is not in scope and added to the list
// causing endpoint to hang.
if (session_->is_in_scope() && IsReading()) {
session_->AddPendingRstStream(id_);
return;
}
// If possible, force a purge of any currently pending data here to make sure
// it is sent before closing the stream. If it returns non-zero then we need
// to wait until the current write finishes and try again to avoid nghttp2

16
src/node_http2.h
View File

@ -764,6 +764,22 @@ class Http2Session : public AsyncWrap,
return (flags_ & SESSION_STATE_CLOSED) || session_ == nullptr;
}
// The changes are backported and exposes APIs to check the
// status flag of `Http2Session`
#define IS_FLAG(name, flag) \
bool is_##name() const { return flags_ & flag; }
IS_FLAG(in_scope, SESSION_STATE_HAS_SCOPE)
IS_FLAG(write_scheduled, SESSION_STATE_WRITE_SCHEDULED)
IS_FLAG(closing, SESSION_STATE_CLOSING)
IS_FLAG(sending, SESSION_STATE_SENDING)
IS_FLAG(write_in_progress, SESSION_STATE_WRITE_IN_PROGRESS)
IS_FLAG(reading_stopped, SESSION_STATE_READING_STOPPED)
IS_FLAG(receive_paused, SESSION_STATE_NGHTTP2_RECV_PAUSED)
#undef IS_FLAG
// Schedule a write if nghttp2 indicates it wants to write to the socket.
void MaybeScheduleWrite();