]> git.kaiwu.me - nginx.git/commitdiff
HTTP/2: fixed send timer handling.
authorValentin Bartenev <vbart@nginx.com>
Tue, 19 Jul 2016 17:31:09 +0000 (20:31 +0300)
committerValentin Bartenev <vbart@nginx.com>
Tue, 19 Jul 2016 17:31:09 +0000 (20:31 +0300)
Checking for return value of c->send_chain() isn't sufficient since there
are data can be left in the SSL buffer.  Now the wew->ready flag is used
instead.

In particular, this fixed a connection leak in cases when all streams were
closed, but there's still some data to be sent in the SSL buffer and the
client forgot about the connection.

src/http/v2/ngx_http_v2.c

index 959e3a6f359591f4ed1803bd49c64a744b55ffaf..0ce8bce261bab003b54bb94a9b7376501c16141c 100644 (file)
@@ -549,7 +549,7 @@ ngx_http_v2_send_output_queue(ngx_http_v2_connection_t *h2c)
         c->tcp_nodelay = NGX_TCP_NODELAY_SET;
     }
 
-    if (cl) {
+    if (!wev->ready) {
         ngx_add_timer(wev, clcf->send_timeout);
 
     } else {