Comparison

plugins/mod_c2s.lua @ 5759:767e29b2cd3a

Merge 0.9->trunk
author Kim Alvefur <zash@zash.se>
date Wed, 24 Jul 2013 21:50:38 +0200
parent 5748:cef2a1122b43
parent 5757:b5ba004beb0a
child 5764:969e0a054795
comparison
equal deleted inserted replaced
5756:61521ce49aae 5759:767e29b2cd3a
23 23
24 local log = module._log; 24 local log = module._log;
25 25
26 local c2s_timeout = module:get_option_number("c2s_timeout"); 26 local c2s_timeout = module:get_option_number("c2s_timeout");
27 local stream_close_timeout = module:get_option_number("c2s_close_timeout", 5); 27 local stream_close_timeout = module:get_option_number("c2s_close_timeout", 5);
28 local opt_keepalives = module:get_option_boolean("tcp_keepalives", false); 28 local opt_keepalives = module:get_option_boolean("c2s_tcp_keepalives", module:get_option_boolean("tcp_keepalives", true));
29 29
30 local sessions = module:shared("sessions"); 30 local sessions = module:shared("sessions");
31 local core_process_stanza = prosody.core_process_stanza; 31 local core_process_stanza = prosody.core_process_stanza;
32 local hosts = prosody.hosts; 32 local hosts = prosody.hosts;
33 33