# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1366975553 -3600
# Node ID 8741bb69a7862de3eeabc2da7adc703563ab8197
# Parent  076534a0384ae33d5d0225f28593f9becb0d8472# Parent  3912c9264ef0e3410d7f6fdd699ff62853eae8ac
Merge 0.9->trunk

diff -r 076534a0384a -r 8741bb69a786 plugins/mod_s2s/mod_s2s.lua
--- a/plugins/mod_s2s/mod_s2s.lua	Thu Apr 25 20:37:51 2013 +0100
+++ b/plugins/mod_s2s/mod_s2s.lua	Fri Apr 26 12:25:53 2013 +0100
@@ -33,7 +33,7 @@
 
 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 @@
 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);