From 49709f75b262c483550cc826471839f624765ab1 Mon Sep 17 00:00:00 2001 From: Maxim Dounin Date: Mon, 23 Dec 2019 21:25:17 +0300 Subject: [PATCH] HTTP/2: fixed socket leak with queued frames (ticket #1689). If a stream is closed with queued frames, it is possible that no further write events will occur on the stream, leading to the socket leak. To fix this, the stream's fake connection read handler is set to ngx_http_v2_close_stream_handler(), to make sure that finalizing the connection with ngx_http_v2_finalize_connection() will be able to close the stream regardless of the current number of queued frames. Additionally, the stream's fake connection fc->error flag is explicitly set, so ngx_http_v2_handle_stream() will post a write event when queued frames are finally sent even if stream flow control window is exhausted. --- src/http/v2/ngx_http_v2.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/http/v2/ngx_http_v2.c b/src/http/v2/ngx_http_v2.c index d0e44475c..d28b8090a 100644 --- a/src/http/v2/ngx_http_v2.c +++ b/src/http/v2/ngx_http_v2.c @@ -4288,8 +4288,9 @@ ngx_http_v2_close_stream(ngx_http_v2_stream_t *stream, ngx_int_t rc) fc = stream->request->connection; if (stream->queued) { + fc->error = 1; fc->write->handler = ngx_http_v2_close_stream_handler; - fc->read->handler = ngx_http_empty_handler; + fc->read->handler = ngx_http_v2_close_stream_handler; return; }