mirrors/prosody
1
0
Fork 0
mirror of https://github.com/bjc/prosody.git synced 2025-04-04 13:47:41 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge 0.9->trunk

Browse source
This commit is contained in:
Kim Alvefur 2013-07-24 21:50:38 +02:00
commit 0f421f9b7c
2 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
plugins/mod_c2s.lua
View file

@ -25,7 +25,7 @@ local log = module._log;
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;