Stream: increase default value for proxy_protocol_timeout to 30s.

This commit is contained in:
Dmitry Volyntsev 2016-09-08 15:51:36 +03:00
parent fe2774a9d6
commit d35f95c568

View File

@ -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, 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); ngx_conf_merge_value(conf->tcp_nodelay, prev->tcp_nodelay, 1);