[nginx] HTTP/2: fixed send timer handling.

Maxim Dounin mdounin at mdounin.ru
Tue Oct 18 14:48:25 UTC 2016

details:   http://hg.nginx.org/nginx/rev/4f8ad0faab3c
branches:  stable-1.10
changeset: 6763:4f8ad0faab3c
user:      Valentin Bartenev <vbart at nginx.com>
date:      Tue Jul 19 20:31:09 2016 +0300
HTTP/2: fixed send timer handling.

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

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 |  2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diffs (12 lines):

diff --git a/src/http/v2/ngx_http_v2.c b/src/http/v2/ngx_http_v2.c
--- a/src/http/v2/ngx_http_v2.c
+++ b/src/http/v2/ngx_http_v2.c
@@ -549,7 +549,7 @@ ngx_http_v2_send_output_queue(ngx_http_v
         c->tcp_nodelay = NGX_TCP_NODELAY_SET;
-    if (cl) {
+    if (!wev->ready) {
         ngx_add_timer(wev, clcf->send_timeout);
     } else {

More information about the nginx-devel mailing list