]> git.kaiwu.me - nginx.git/commitdiff
Stream: increase default value for proxy_protocol_timeout to 30s.
authorDmitry Volyntsev <xeioex@nginx.com>
Thu, 8 Sep 2016 12:51:36 +0000 (15:51 +0300)
committerDmitry Volyntsev <xeioex@nginx.com>
Thu, 8 Sep 2016 12:51:36 +0000 (15:51 +0300)
src/stream/ngx_stream_core_module.c

index 23f1e85084296207a1fc04f7c4d6022f4d1c7748..1c808ad591ab2d77aa97c2cc39fa41ffe734a6dc 100644 (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,
-                              prev->proxy_protocol_timeout, 5000);
+                              prev->proxy_protocol_timeout, 30000);
 
     ngx_conf_merge_value(conf->tcp_nodelay, prev->tcp_nodelay, 1);