From d35f95c568fe78fdedf44459876f0451645fc74d Mon Sep 17 00:00:00 2001 From: Dmitry Volyntsev Date: Thu, 8 Sep 2016 15:51:36 +0300 Subject: [PATCH] Stream: increase default value for proxy_protocol_timeout to 30s. --- src/stream/ngx_stream_core_module.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/stream/ngx_stream_core_module.c b/src/stream/ngx_stream_core_module.c index 23f1e8508..1c808ad59 100644 --- a/src/stream/ngx_stream_core_module.c +++ b/src/stream/ngx_stream_core_module.c @@ -249,7 +249,7 @@ ngx_stream_core_merge_srv_conf(ngx_conf_t *cf, void *parent, void *child) } ngx_conf_merge_msec_value(conf->proxy_protocol_timeout, - prev->proxy_protocol_timeout, 5000); + prev->proxy_protocol_timeout, 30000); ngx_conf_merge_value(conf->tcp_nodelay, prev->tcp_nodelay, 1);