63 lines
2.3 KiB
Diff
63 lines
2.3 KiB
Diff
|
From fda4b81635672568efc716889d79e446bccc90ed Mon Sep 17 00:00:00 2001
|
||
|
|
From: Daniel Stenberg <daniel@haxx.se>
|
||
|
|
Date: Fri, 1 Apr 2022 13:23:04 +0200
|
||
|
|
Subject: [PATCH 3/3] http2: RST the stream if we stop it on our own will
|
||
|
|
|
||
|
|
For the "simulated 304" case the done-call isn't considered "premature"
|
||
|
|
but since the server didn't close the stream it needs to be reset to
|
||
|
|
stop delivering data.
|
||
|
|
|
||
|
|
Closes #8664
|
||
|
|
---
|
||
|
|
lib/http2.c | 24 +++++++++++++++---------
|
||
|
|
1 file changed, 15 insertions(+), 9 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/lib/http2.c b/lib/http2.c
|
||
|
|
index 34daaf17c..34031f17c 100644
|
||
|
|
--- a/lib/http2.c
|
||
|
|
+++ b/lib/http2.c
|
||
|
|
@@ -825,10 +825,14 @@ static int on_data_chunk_recv(nghttp2_session *session, uint8_t flags,
|
||
|
|
|
||
|
|
/* get the stream from the hash based on Stream ID */
|
||
|
|
data_s = nghttp2_session_get_stream_user_data(session, stream_id);
|
||
|
|
- if(!data_s)
|
||
|
|
- /* Receiving a Stream ID not in the hash should not happen, this is an
|
||
|
|
- internal error more than anything else! */
|
||
|
|
- return NGHTTP2_ERR_CALLBACK_FAILURE;
|
||
|
|
+ if(!data_s) {
|
||
|
|
+ /* Receiving a Stream ID not in the hash should not happen - unless
|
||
|
|
+ we have aborted a transfer artificially and there were more data
|
||
|
|
+ in the pipeline. Silently ignore. */
|
||
|
|
+ H2BUGF(fprintf(stderr, "Data for stream %u but it doesn't exist\n",
|
||
|
|
+ stream_id));
|
||
|
|
+ return 0;
|
||
|
|
+ }
|
||
|
|
|
||
|
|
stream = data_s->req.p.http;
|
||
|
|
if(!stream)
|
||
|
|
@@ -1234,17 +1238,19 @@ void Curl_http2_done(struct Curl_easy *data, bool premature)
|
||
|
|
!httpc->h2) /* not HTTP/2 ? */
|
||
|
|
return;
|
||
|
|
|
||
|
|
- if(premature) {
|
||
|
|
+ /* do this before the reset handling, as that might clear ->stream_id */
|
||
|
|
+ if(http->stream_id == httpc->pause_stream_id) {
|
||
|
|
+ H2BUGF(infof(data, "DONE the pause stream (%x)", http->stream_id));
|
||
|
|
+ httpc->pause_stream_id = 0;
|
||
|
|
+ }
|
||
|
|
+ if(premature || (!http->closed && http->stream_id)) {
|
||
|
|
/* RST_STREAM */
|
||
|
|
set_transfer(httpc, data); /* set the transfer */
|
||
|
|
+ H2BUGF(infof(data, "RST stream %x", http->stream_id));
|
||
|
|
if(!nghttp2_submit_rst_stream(httpc->h2, NGHTTP2_FLAG_NONE,
|
||
|
|
http->stream_id, NGHTTP2_STREAM_CLOSED))
|
||
|
|
(void)nghttp2_session_send(httpc->h2);
|
||
|
|
}
|
||
|
|
- if(http->stream_id == httpc->pause_stream_id) {
|
||
|
|
- H2BUGF(infof(data, "DONE the pause stream!"));
|
||
|
|
- httpc->pause_stream_id = 0;
|
||
|
|
- }
|
||
|
|
|
||
|
|
if(data->state.drain)
|
||
|
|
drained_transfer(data, httpc);
|