changeset 6762:078f17b2535b stable-1.10

HTTP/2: avoid sending output queue if there's nothing to send. Particularly this fixes alerts on OS X and NetBSD systems when HTTP/2 is configured over plain TCP sockets. On these systems calling writev() with no data leads to EINVAL errors being logged as "writev() failed (22: Invalid argument) while processing HTTP/2 connection".
author Valentin Bartenev <vbart@nginx.com>
date Tue, 19 Jul 2016 20:30:21 +0300
parents 73e62bd2ce69
children 4f8ad0faab3c
files src/http/v2/ngx_http_v2.c
diffstat 1 files changed, 10 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/src/http/v2/ngx_http_v2.c
+++ b/src/http/v2/ngx_http_v2.c
@@ -410,6 +410,16 @@ ngx_http_v2_write_handler(ngx_event_t *w
 
     ngx_log_debug0(NGX_LOG_DEBUG_HTTP, c->log, 0, "http2 write handler");
 
+    if (h2c->last_out == NULL && !c->buffered) {
+
+        if (wev->timer_set) {
+            ngx_del_timer(wev);
+        }
+
+        ngx_http_v2_handle_connection(h2c);
+        return;
+    }
+
     h2c->blocked = 1;
 
     rc = ngx_http_v2_send_output_queue(h2c);