From c425f19daa48e00bc0d84d0e22eb1452bf3e9901 Mon Sep 17 00:00:00 2001
From: Valentin Bartenev <vbart@nginx.com>
Date: Wed, 27 Aug 2014 20:44:11 +0400
Subject: [PATCH] SPDY: avoid setting timeout on stream events in
 ngx_http_writer().

The SPDY module doesn't expect timers can be set on stream events for reasons
other than delaying output.  But ngx_http_writer() could add timer on write
event if the delayed flag wasn't set and nginx is waiting for AIO completion.
That could cause delays in sending response over SPDY when file AIO was used.
---
 src/http/ngx_http_request.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/http/ngx_http_request.c b/src/http/ngx_http_request.c
index 845ada322..2b932dee4 100644
--- a/src/http/ngx_http_request.c
+++ b/src/http/ngx_http_request.c
@@ -2656,6 +2656,12 @@ ngx_http_writer(ngx_http_request_t *r)
 
     if (r->buffered || r->postponed || (r == r->main && c->buffered)) {
 
+#if (NGX_HTTP_SPDY)
+        if (r->spdy_stream) {
+            return;
+        }
+#endif
+
         if (!wev->delayed) {
             ngx_add_timer(wev, clcf->send_timeout);
         }