Mercurial > hg > nginx

changeset 6685:4a16fceea03b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 9cac11efb205
children f28e74f02c88
files src/stream/ngx_stream_core_module.c
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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_
     }
 
     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);