| commit | c4694f44e98260494584483232e2a9ef850d8048 | [log] [tgz] |
|---|---|---|
| author | Dmitry Volyntsev <xeioex@nginx.com> | Thu Sep 08 15:51:36 2016 +0300 |
| committer | Dmitry Volyntsev <xeioex@nginx.com> | Thu Sep 08 15:51:36 2016 +0300 |
| tree | 785b8bfaa09c6b9cad932e615529083f6a654c2a | |
| parent | 5b441572de2e2fce43849f194d4603a1d6d428c0 [diff] |
Stream: increase default value for proxy_protocol_timeout to 30s.
diff --git a/src/stream/ngx_stream_core_module.c b/src/stream/ngx_stream_core_module.c index 23f1e85..1c808ad 100644 --- a/src/stream/ngx_stream_core_module.c +++ b/src/stream/ngx_stream_core_module.c
@@ -249,7 +249,7 @@ } 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);