diff options
author | Denys Otrishko <shishugi@gmail.com> | 2019-12-08 14:23:19 +0300 |
---|---|---|
committer | Ruben Bridgewater <ruben@bridgewater.de> | 2019-12-25 13:07:04 +0300 |
commit | be3c7aceba58f0a58ee4813a9894681d9c8ba56e (patch) | |
tree | 5bca75734b6ebde18202b43d37c88b4d97a0698d /src/node_http2.cc | |
parent | a8c2c667ce896f3b168e8622eefa878b355d7c9a (diff) |
http2: wait for session socket writable end on close/destroy
This slightly alters the behaviour of session close by first using
.end() on a session socket to finish writing the data and only then
calls .destroy() to make sure the Readable side is closed. This allows
the socket to finish transmitting data, receive proper FIN packet and
avoid ECONNRESET errors upon graceful close.
onStreamClose now directly calls stream.destroy() instead of
kMaybeDestroy because the latter will first check that the stream has
writableFinished set. And that may not be true as we have just
(synchronously) called .end() on the stream if it was not closed and
that doesn't give it enough time to finish. Furthermore there is no
point in waiting for 'finish' as the other party have already closed the
stream and we won't be able to write anyway.
This also changes a few tests to correctly handle graceful session
close. This includes:
* not reading request data (on client side)
* not reading push stream data (on client side)
* relying on socket.destroy() (on client) to finish server session
due to the destroy of the socket without closing the server session.
As the goaway itself is *not* a session close.
Added few 'close' event mustCall checks.
PR-URL: https://github.com/nodejs/node/pull/30854
Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Rich Trott <rtrott@gmail.com>
Diffstat (limited to 'src/node_http2.cc')
-rw-r--r-- | src/node_http2.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/node_http2.cc b/src/node_http2.cc index b8d93171329..1110288f6f9 100644 --- a/src/node_http2.cc +++ b/src/node_http2.cc @@ -1799,7 +1799,7 @@ void Http2Session::OnStreamRead(ssize_t nread, const uv_buf_t& buf_) { Context::Scope context_scope(env()->context()); Http2Scope h2scope(this); CHECK_NOT_NULL(stream_); - Debug(this, "receiving %d bytes", nread); + Debug(this, "receiving %d bytes, offset %d", nread, stream_buf_offset_); AllocatedBuffer buf(env(), buf_); // Only pass data on if nread > 0 |