aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/stream/ngx_stream_core_module.c2
1 files changed, 1 insertions, 1 deletions
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);