aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2017-11-10 17:47:50 +0100
committerKim Alvefur <zash@zash.se>2017-11-10 17:47:50 +0100
commit7896770380e0956d2c7b764effee072f6b138e34 (patch)
tree2750c26e7e3d4b905a6bae5249c5d34208501c39
parentc904d1e28dbf00d2deee806ddb8de08be0eb0218 (diff)
parentb395681f115a39143fec23ea8c767c9969bb7db8 (diff)
downloadprosody-7896770380e0956d2c7b764effee072f6b138e34.tar.gz
prosody-7896770380e0956d2c7b764effee072f6b138e34.zip
Merge 0.10->trunk
-rw-r--r--plugins/mod_c2s.lua2
1 files changed, 1 insertions, 1 deletions
diff --git a/plugins/mod_c2s.lua b/plugins/mod_c2s.lua
index 7b82cc5f..c1dbc885 100644
--- a/plugins/mod_c2s.lua
+++ b/plugins/mod_c2s.lua
@@ -23,7 +23,7 @@ local xmlns_xmpp_streams = "urn:ietf:params:xml:ns:xmpp-streams";
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));