commit 678d1bfb225ddfa49700b61eebf17be68dbea9c0
author Valentin Bartenev <vbart@nginx.com> Tue Jul 19 20:34:02 2016 +0300
committer Valentin Bartenev <vbart@nginx.com> Tue Jul 19 20:34:02 2016 +0300
tree 729958b49575eb9ad714cee3764e45b93f00eafa
parent 64b4176171400d395bf23c06cca905e73da35287

HTTP/2: refactored ngx_http_v2_send_output_queue().

Now it returns NGX_AGAIN if there's still data to be sent.

src/http/v2/ngx_http_v2.c

diff --git a/src/http/v2/ngx_http_v2.c b/src/http/v2/ngx_http_v2.c
index 0ce8bce..292f430 100644
--- a/src/http/v2/ngx_http_v2.c
+++ b/src/http/v2/ngx_http_v2.c
@@ -478,7 +478,7 @@
     wev = c->write;
 
     if (!wev->ready) {
-        return NGX_OK;
+        return NGX_AGAIN;
     }
 
     cl = NULL;
@@ -549,15 +549,6 @@
         c->tcp_nodelay = NGX_TCP_NODELAY_SET;
     }
 
-    if (!wev->ready) {
-        ngx_add_timer(wev, clcf->send_timeout);
-
-    } else {
-        if (wev->timer_set) {
-            ngx_del_timer(wev);
-        }
-    }
-
     for ( /* void */ ; out; out = fn) {
         fn = out->next;
 
@@ -582,6 +573,15 @@
 
     h2c->last_out = frame;
 
+    if (!wev->ready) {
+        ngx_add_timer(wev, clcf->send_timeout);
+        return NGX_AGAIN;
+    }
+
+    if (wev->timer_set) {
+        ngx_del_timer(wev);
+    }
+
     return NGX_OK;
 
 error: