diff options
| author | Matthew Wild <mwild1@gmail.com> | 2013-04-26 12:25:53 +0100 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2013-04-26 12:25:53 +0100 |
| commit | 240c5480a9abde4de5eab78c4da287e4e3de7509 (patch) | |
| tree | 60d2de07f0307ab6968d36f1f27f4b938e53dc80 /plugins | |
| parent | f9884fa773f3d56f098218729578b48da374342d (diff) | |
| parent | 231a76965c326988df9bceb6de5341814e1099e9 (diff) | |
| download | prosody-240c5480a9abde4de5eab78c4da287e4e3de7509.tar.gz prosody-240c5480a9abde4de5eab78c4da287e4e3de7509.zip | |
Merge 0.9->trunk
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/mod_s2s/mod_s2s.lua | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/plugins/mod_s2s/mod_s2s.lua b/plugins/mod_s2s/mod_s2s.lua index 0ece23a6..a935239e 100644 --- a/plugins/mod_s2s/mod_s2s.lua +++ b/plugins/mod_s2s/mod_s2s.lua @@ -33,7 +33,7 @@ local s2sout = module:require("s2sout"); local connect_timeout = module:get_option_number("s2s_timeout", 90); local stream_close_timeout = module:get_option_number("s2s_close_timeout", 5); - +local opt_keepalives = module:get_option_boolean("s2s_tcp_keepalives", module:get_option_boolean("tcp_keepalives", true)); local secure_auth = module:get_option_boolean("s2s_secure_auth", false); -- One day... local secure_domains, insecure_domains = module:get_option_set("s2s_secure_domains", {})._items, module:get_option_set("s2s_insecure_domains", {})._items; @@ -563,6 +563,7 @@ local function initialize_session(session) end function listener.onconnect(conn) + conn:setoption("keepalive", opt_keepalives); local session = sessions[conn]; if not session then -- New incoming connection session = s2s_new_incoming(conn); |