# HG changeset patch
# User Dmitry Volyntsev <xeioex@nginx.com>
# Date 1473339096 -10800
# Node ID 4a16fceea03bde6653e05d337e87907f085535b3
# Parent  9cac11efb205595ee82a413ee4513cae92d617ce
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
--- 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);