moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2024-12-25 01:28:51 -05:00
Code Issues Releases Wiki Activity

http2: make sure to send after RST_STREAM

Browse Source 
If this is the last stream on this connection, the RST_STREAM might not
get pushed to the wire otherwise.

Fixes #2882
Closes #2887
Researched-by: Michael Kaufmann
This commit is contained in:
Daniel Stenberg 2018-08-16 13:21:11 +02:00
parent ba58ce669c
commit c7ea4ddd2e
No known key found for this signature in database
GPG Key ID: 5CC908FDB71E12C2
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/http2.c
View File

@ -1146,6 +1146,9 @@ void Curl_http2_done(struct connectdata *conn, bool premature)
struct HTTP *http = data->req.protop; struct HTTP *http = data->req.protop;
struct http_conn *httpc = &conn->proto.httpc; struct http_conn *httpc = &conn->proto.httpc;
if(!httpc->h2) /* not HTTP/2 ? */
return;
if(data->state.drain) if(data->state.drain)
drained_transfer(data, httpc); drained_transfer(data, httpc);
@ -1166,8 +1169,10 @@ void Curl_http2_done(struct connectdata *conn, bool premature)
if(premature) { if(premature) {
/* RST_STREAM */ /* RST_STREAM */
nghttp2_submit_rst_stream(httpc->h2, NGHTTP2_FLAG_NONE, http->stream_id, if(!nghttp2_submit_rst_stream(httpc->h2, NGHTTP2_FLAG_NONE,
NGHTTP2_STREAM_CLOSED); http->stream_id, NGHTTP2_STREAM_CLOSED))
(void)nghttp2_session_send(httpc->h2);
if(http->stream_id == httpc->pause_stream_id) { if(http->stream_id == httpc->pause_stream_id) {
infof(data, "stopped the pause stream!\n"); infof(data, "stopped the pause stream!\n");
httpc->pause_stream_id = 0; httpc->pause_stream_id = 0;