From: Dmitry Volyntsev <xeioex@nginx.com>
Date: Thu, 8 Sep 2016 12:51:36 +0000 (+0300)
Subject: Stream: increase default value for proxy_protocol_timeout to 30s.
X-Git-Tag: release-1.11.4~4
X-Git-Url: http://git.kaiwu.me/postgresql/log/contrib/postgres_fdw/postgres_fdw.c?a=commitdiff_plain;h=d35f95c568fe78fdedf44459876f0451645fc74d;p=nginx.git

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
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);