Merge 0.10->trunk
authorKim Alvefur <zash@zash.se>
Fri, 10 Nov 2017 17:47:50 +0100
changeset 8393 4c629fde768c
parent 8392 5d866eb8f18f (current diff)
parent 8391 9ee56e9ad47a (diff)
child 8395 ff8e122526f4
Merge 0.10->trunk
plugins/mod_c2s.lua
--- a/plugins/mod_c2s.lua	Fri Nov 10 17:47:11 2017 +0100
+++ b/plugins/mod_c2s.lua	Fri Nov 10 17:47:50 2017 +0100
@@ -23,7 +23,7 @@
 
 local log = module._log;
 
-local c2s_timeout = module:get_option_number("c2s_timeout");
+local c2s_timeout = module:get_option_number("c2s_timeout", 300);
 local stream_close_timeout = module:get_option_number("c2s_close_timeout", 5);
 local opt_keepalives = module:get_option_boolean("c2s_tcp_keepalives", module:get_option_boolean("tcp_keepalives", true));