Mercurial > prosody-hg

diff plugins/mod_c2s.lua @ 5759:767e29b2cd3a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge 0.9->trunk
author Kim Alvefur <zash@zash.se>
date Wed, 24 Jul 2013 21:50:38 +0200
parents cef2a1122b43 b5ba004beb0a
children 969e0a054795
line wrap: on
line diff
--- a/plugins/mod_c2s.lua	Mon Jul 22 20:29:41 2013 +0200
+++ b/plugins/mod_c2s.lua	Wed Jul 24 21:50:38 2013 +0200
@@ -25,7 +25,7 @@
 
 local c2s_timeout = module:get_option_number("c2s_timeout");
 local stream_close_timeout = module:get_option_number("c2s_close_timeout", 5);
-local opt_keepalives = module:get_option_boolean("tcp_keepalives", false);
+local opt_keepalives = module:get_option_boolean("c2s_tcp_keepalives", module:get_option_boolean("tcp_keepalives", true));
 
 local sessions = module:shared("sessions");
 local core_process_stanza = prosody.core_process_stanza;