diff options
| author | Kim Alvefur <zash@zash.se> | 2017-11-10 17:47:50 +0100 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2017-11-10 17:47:50 +0100 |
| commit | b27c0335f178ca2bfb7baaecb164302dec5e6a47 (patch) | |
| tree | 2750c26e7e3d4b905a6bae5249c5d34208501c39 /plugins | |
| parent | 0251f343054715fd750860ad537fa16a0419df65 (diff) | |
| parent | 2b87305e904ea6d364ba072be3c409fb0b933dd4 (diff) | |
| download | prosody-b27c0335f178ca2bfb7baaecb164302dec5e6a47.tar.gz prosody-b27c0335f178ca2bfb7baaecb164302dec5e6a47.zip | |
Merge 0.10->trunk
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/mod_c2s.lua | 2 |
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)); |