From: Valentin Bartenev Date: Tue, 10 Dec 2013 16:27:33 +0000 (+0400) Subject: SPDY: drop the "delayed" flag when finalizing connection. X-Git-Url: http://www.kaiwu.me/postgresql/commit/?a=commitdiff_plain;h=7f54528ca07e49abd83d8c86c8125202dcf2798c;p=nginx.git SPDY: drop the "delayed" flag when finalizing connection. This flag in SPDY fake write events serves the same purposes as the "ready" flag in real events, and it must be dropped if request needs to be handled. Otherwise, it can prevent the request from finalization if ngx_http_writer() was set, which results in a connection leak. Found by Xiaochen Wang. --- diff --git a/src/http/ngx_http_spdy.c b/src/http/ngx_http_spdy.c index 36e23be02..2346ad7a1 100644 --- a/src/http/ngx_http_spdy.c +++ b/src/http/ngx_http_spdy.c @@ -2855,7 +2855,9 @@ ngx_http_spdy_finalize_connection(ngx_http_spdy_connection_t *sc, if (stream->waiting) { r->blocked -= stream->waiting; stream->waiting = 0; + ev = fc->write; + ev->delayed = 0; } else { ev = fc->read;