Commit 82af8ac
http2,doc: minor fixes
Some small fixes on HTTP/2 and its documentation:
- Add a note that, on server streams, it's not necessary
to start data flow.
- Set EOF flag if we have marked all data for sending:
there's no need to wait until the queue is
actually empty (and send a separate, empty DATA).
(Note that, even with this change, a separate DATA
frame will always be sent, because the streams
layer waits until data has been flushed before
dispatching EOF)
Backport-PR-URL: #34845
PR-URL: #28044
Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
Reviewed-By: Anna Henningsen <anna@addaleax.net>1 parent e85ca7a commit 82af8ac
2 files changed
Lines changed: 4 additions & 3 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -927,8 +927,9 @@ the value is `undefined`, the stream is not yet ready for use. | |||
| 927 | 927 | All [`Http2Stream`][] instances are destroyed either when: | |
| 928 | 928 | ||
| 929 | 929 | * An `RST_STREAM` frame for the stream is received by the connected peer, | |
| 930 | - and pending data has been read. | ||
| 931 | - * The `http2stream.close()` method is called, and pending data has been read. | ||
| 930 | + and (for client streams only) pending data has been read. | ||
| 931 | + * The `http2stream.close()` method is called, and (for client streams only) | ||
| 932 | + pending data has been read. | ||
| 932 | 933 | * The `http2stream.destroy()` or `http2session.destroy()` methods are called. | |
| 933 | 934 | ||
| 934 | 935 | When an `Http2Stream` instance is destroyed, an attempt will be made to send an | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -2367,7 +2367,7 @@ ssize_t Http2Stream::Provider::Stream::OnRead(nghttp2_session* handle, | |||
| 2367 | 2367 | return NGHTTP2_ERR_DEFERRED; | |
| 2368 | 2368 | } | |
| 2369 | 2369 | ||
| 2370 | - if (stream->queue_.empty() && !stream->IsWritable()) { | ||
| 2370 | + if (stream->available_outbound_length_ == 0 && !stream->IsWritable()) { | ||
| 2371 | 2371 | Debug(session, "no more data for stream %d", id); | |
| 2372 | 2372 | *flags |= NGHTTP2_DATA_FLAG_EOF; | |
| 2373 | 2373 | if (stream->HasTrailers()) { | |
0 commit comments