]> git.kaiwu.me - nginx.git/commitdiff
HTTP/2: prevented double termination of a stream.
authorValentin Bartenev <vbart@nginx.com>
Thu, 16 Jun 2016 17:55:11 +0000 (20:55 +0300)
committerValentin Bartenev <vbart@nginx.com>
Thu, 16 Jun 2016 17:55:11 +0000 (20:55 +0300)
According to RFC 7540, an endpoint should not send more than one RST_STREAM
frame for any stream.

Also, now all the data frames will be skipped while termination.

src/http/v2/ngx_http_v2.c

index 94f57a717361bb739ac95eda20324cb2dd59fd2a..99cb3fc70cd87595bcd99674d5ea362ab767d63d 100644 (file)
@@ -3890,6 +3890,10 @@ ngx_http_v2_terminate_stream(ngx_http_v2_connection_t *h2c,
     ngx_event_t       *rev;
     ngx_connection_t  *fc;
 
+    if (stream->rst_sent) {
+        return NGX_OK;
+    }
+
     if (ngx_http_v2_send_rst_stream(h2c, stream->node->id, status)
         == NGX_ERROR)
     {
@@ -3897,6 +3901,7 @@ ngx_http_v2_terminate_stream(ngx_http_v2_connection_t *h2c,
     }
 
     stream->rst_sent = 1;
+    stream->skip_data = 1;
 
     fc = stream->request->connection;
     fc->error = 1;