diff options
| author | Dmitry Volyntsev <xeioex@nginx.com> | 2016-09-08 15:51:36 +0300 |
|---|---|---|
| committer | Dmitry Volyntsev <xeioex@nginx.com> | 2016-09-08 15:51:36 +0300 |
| commit | d35f95c568fe78fdedf44459876f0451645fc74d (patch) | |
| tree | 785b8bfaa09c6b9cad932e615529083f6a654c2a /src | |
| parent | fe2774a9d689fa1bf201dd0e89449e3d9e4ad926 (diff) | |
| download | nginx-d35f95c568fe78fdedf44459876f0451645fc74d.tar.gz nginx-d35f95c568fe78fdedf44459876f0451645fc74d.zip | |
Stream: increase default value for proxy_protocol_timeout to 30s.
Diffstat (limited to 'src')
| -rw-r--r-- | src/stream/ngx_stream_core_module.c | 2 |
1 files changed, 1 insertions, 1 deletions
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); |