diff options
| author | Harry Sintonen <sintonen@iki.fi> | 2023-02-16 06:26:26 +0200 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2023-02-16 09:33:52 +0100 |
| commit | 87ed650d04dc1a6f7944a5d952f7d5b0934a19ac (patch) | |
| tree | 4e5f5947d86b63cda9763ae1bb6fa040bc8d0364 /lib/http2.c | |
| parent | 3103de2053ca8cacf9cdbe78764ba6814481709f (diff) | |
| download | curl-87ed650d04dc1a6f7944a5d952f7d5b0934a19ac.tar.gz | |
http2: set drain on stream end
Ensure that on_frame_recv() stream end will trigger a read if there is
pending data. Without this it could happen that the pending data is
never consumed.
This combined with https://github.com/curl/curl/pull/10529 should fix
https://github.com/curl/curl/issues/10525
Ref: https://github.com/curl/curl/issues/10525
Closes #10530
Diffstat (limited to 'lib/http2.c')
| -rw-r--r-- | lib/http2.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/lib/http2.c b/lib/http2.c index 1ef5d3949..bdb5e7378 100644 --- a/lib/http2.c +++ b/lib/http2.c @@ -868,6 +868,14 @@ static int on_frame_recv(nghttp2_session *session, const nghttp2_frame *frame, return NGHTTP2_ERR_CALLBACK_FAILURE; } } + if(frame->hd.flags & NGHTTP2_FLAG_END_STREAM) { + /* Stream has ended. If there is pending data, ensure that read + will occur to consume it. */ + if(!data->state.drain && stream->memlen) { + drain_this(cf, data_s); + Curl_expire(data, 0, EXPIRE_RUN_NOW); + } + } break; case NGHTTP2_HEADERS: DEBUGF(LOG_CF(data_s, cf, "[h2sid=%u] recv frame HEADERS", stream_id)); |