Mercurial > hg > nginx
comparison src/stream/ngx_stream_core_module.c @ 6685:4a16fceea03b
Stream: increase default value for proxy_protocol_timeout to 30s.
author | Dmitry Volyntsev <xeioex@nginx.com> |
---|---|
date | Thu, 08 Sep 2016 15:51:36 +0300 |
parents | 7357abd1fa8c |
children | 3908156a51fa |
comparison
equal
deleted
inserted
replaced
6684:9cac11efb205 | 6685:4a16fceea03b |
---|---|
247 conf->error_log = &cf->cycle->new_log; | 247 conf->error_log = &cf->cycle->new_log; |
248 } | 248 } |
249 } | 249 } |
250 | 250 |
251 ngx_conf_merge_msec_value(conf->proxy_protocol_timeout, | 251 ngx_conf_merge_msec_value(conf->proxy_protocol_timeout, |
252 prev->proxy_protocol_timeout, 5000); | 252 prev->proxy_protocol_timeout, 30000); |
253 | 253 |
254 ngx_conf_merge_value(conf->tcp_nodelay, prev->tcp_nodelay, 1); | 254 ngx_conf_merge_value(conf->tcp_nodelay, prev->tcp_nodelay, 1); |
255 | 255 |
256 return NGX_CONF_OK; | 256 return NGX_CONF_OK; |
257 } | 257 } |