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

Merge 0.9->0.10

Browse source
This commit is contained in:
Kim Alvefur 2013-12-18 18:36:54 +01:00
commit ece61cbae1
1 changed files with 7 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

8
plugins/mod_component.lua
View file

@ -25,6 +25,8 @@ local hosts = prosody.hosts;
local log = module._log; local log = module._log;
local opt_keepalives = module:get_option_boolean("component_tcp_keepalives", module:get_option_boolean("tcp_keepalives", true));
local sessions = module:shared("sessions"); local sessions = module:shared("sessions");
function module.add_host(module) function module.add_host(module)
@ -86,7 +88,7 @@ function module.add_host(module)
return true; return true;
end end
module:hook("stanza/jabber:component:accept:handshake", handle_component_auth); module:hook("stanza/jabber:component:accept:handshake", handle_component_auth, -1);
-- Handle stanzas addressed to this component -- Handle stanzas addressed to this component
local function handle_stanza(event) local function handle_stanza(event)
@ -270,6 +272,10 @@ function listener.onconnect(conn)
session.log = logger.init(conn_name); session.log = logger.init(conn_name);
session.close = session_close; session.close = session_close;
if opt_keepalives then
conn:setoption("keepalive", opt_keepalives);
end
session.log("info", "Incoming Jabber component connection"); session.log("info", "Incoming Jabber component connection");
local stream = new_xmpp_stream(session, stream_callbacks); local stream = new_xmpp_stream(session, stream_callbacks);