IntenseWebs/nginx
3
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

HTTP/2: introduced separate handler to retry stream close.

Browse Source 
When ngx_http_v2_close_stream_handler() is used to retry stream close
after queued frames are sent, client timeouts on the stream can be
logged multiple times and/or in addition to already happened errors.
To resolve this, separate ngx_http_v2_retry_close_stream_handler()
was introduced, which does not try to log timeouts.
This commit is contained in:
Maxim Dounin 2019-12-23 21:25:21 +03:00
parent 49709f75b2
commit 810559665a
1 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/http/v2/ngx_http_v2.c
View File

@ -178,6 +178,7 @@ static void ngx_http_v2_read_client_request_body_handler(ngx_http_request_t *r);
static ngx_int_t ngx_http_v2_terminate_stream(ngx_http_v2_connection_t *h2c, static ngx_int_t ngx_http_v2_terminate_stream(ngx_http_v2_connection_t *h2c,
ngx_http_v2_stream_t *stream, ngx_uint_t status); ngx_http_v2_stream_t *stream, ngx_uint_t status);
static void ngx_http_v2_close_stream_handler(ngx_event_t *ev); static void ngx_http_v2_close_stream_handler(ngx_event_t *ev);
static void ngx_http_v2_retry_close_stream_handler(ngx_event_t *ev);
static void ngx_http_v2_handle_connection_handler(ngx_event_t *rev); static void ngx_http_v2_handle_connection_handler(ngx_event_t *rev);
static void ngx_http_v2_idle_handler(ngx_event_t *rev); static void ngx_http_v2_idle_handler(ngx_event_t *rev);
static void ngx_http_v2_finalize_connection(ngx_http_v2_connection_t *h2c, static void ngx_http_v2_finalize_connection(ngx_http_v2_connection_t *h2c,
@ -4289,8 +4290,8 @@ ngx_http_v2_close_stream(ngx_http_v2_stream_t *stream, ngx_int_t rc)
if (stream->queued) { if (stream->queued) {
fc->error = 1; fc->error = 1;
fc->write->handler = ngx_http_v2_close_stream_handler; fc->write->handler = ngx_http_v2_retry_close_stream_handler;
fc->read->handler = ngx_http_v2_close_stream_handler; fc->read->handler = ngx_http_v2_retry_close_stream_handler;
return; return;
} }
@ -4412,6 +4413,22 @@ ngx_http_v2_close_stream_handler(ngx_event_t *ev)
} }
static void
ngx_http_v2_retry_close_stream_handler(ngx_event_t *ev)
{
ngx_connection_t *fc;
ngx_http_request_t *r;
fc = ev->data;
r = fc->data;
ngx_log_debug0(NGX_LOG_DEBUG_HTTP, fc->log, 0,
"http2 retry close stream handler");
ngx_http_v2_close_stream(r->stream, 0);
}
static void static void
ngx_http_v2_handle_connection_handler(ngx_event_t *rev) ngx_http_v2_handle_connection_handler(ngx_event_t *rev)
{ {