Unverified Commit c7ea4ddd authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

http2: make sure to send after RST_STREAM 

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
parent ba58ce66

lib/http2.c

+7 −2
Original line number Diff line number Diff line
@@ -1146,6 +1146,9 @@ void Curl_http2_done(struct connectdata *conn, bool premature) 
  struct HTTP *http = data->req.protop;

  struct http_conn *httpc = &conn->proto.httpc;



  if(!httpc->h2) /* not HTTP/2 ? */

    return;



  if(data->state.drain)

    drained_transfer(data, httpc);
@@ -1166,8 +1169,10 @@ void Curl_http2_done(struct connectdata *conn, bool premature) 


  if(premature) {

    /* RST_STREAM */

    nghttp2_submit_rst_stream(httpc->h2, NGHTTP2_FLAG_NONE, http->stream_id,

                              NGHTTP2_STREAM_CLOSED);

    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) {

      infof(data, "stopped the pause stream!\n");

      httpc->pause_stream_id = 0;