Merge 0.9->0.10

diff --combined plugins/mod_component.lua
index 3eaacb8eaf123994cea5237db7163c11b51cf5a4,c5a1da81ce49e3f920eae0dab735d92977043c3e..1497b12fc6a0096661aae5e1345cab9f25c4be52
--- 1/plugins/mod_component.lua
--- 2/plugins/mod_component.lua
+++ b/plugins/mod_component.lua
@@@ -1,7 -1,7 +1,7 @@@
  -- Prosody IM
  -- Copyright (C) 2008-2010 Matthew Wild
  -- Copyright (C) 2008-2010 Waqas Hussain
 --- 
 +--
  -- This project is MIT/X11 licensed. Please see the
  -- COPYING file in the source package for more information.
  --
@@@ -25,13 -25,15 +25,15 @@@ local hosts = prosody.hosts
  
  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");
  
  function module.add_host(module)
        if module:get_host_type() ~= "component" then
                error("Don't load mod_component manually, it should be for a component, please see http://prosody.im/doc/components", 0);
        end
 -      
 +
        local env = module.environment;
        env.connected = false;
  
@@@ -42,26 -44,26 +44,26 @@@
                send = nil;
                session.on_destroy = nil;
        end
 -      
 +
        -- Handle authentication attempts by component
        local function handle_component_auth(event)
                local session, stanza = event.origin, event.stanza;
 -              
 +
                if session.type ~= "component_unauthed" then return; end
 -      
 +
                if (not session.host) or #stanza.tags > 0 then
                        (session.log or log)("warn", "Invalid component handshake for host: %s", session.host);
                        session:close("not-authorized");
                        return true;
                end
 -              
 +
                local secret = module:get_option("component_secret");
                if not secret then
                        (session.log or log)("warn", "Component attempted to identify as %s, but component_secret is not set", session.host);
                        session:close("not-authorized");
                        return true;
                end
 -              
 +
                local supplied_token = t_concat(stanza);
                local calculated_token = sha1(session.streamid..secret, true);
                if supplied_token:lower() ~= calculated_token:lower() then
@@@ -69,13 -71,13 +71,13 @@@
                        session:close{ condition = "not-authorized", text = "Given token does not match calculated token" };
                        return true;
                end
 -              
 +
                if env.connected then
                        module:log("error", "Second component attempted to connect, denying connection");
                        session:close{ condition = "conflict", text = "Component already connected" };
                        return true;
                end
 -              
 +
                env.connected = true;
                send = session.send;
                session.on_destroy = on_destroy;
@@@ -83,10 -85,10 +85,10 @@@
                session.type = "component";
                module:log("info", "External component successfully authenticated");
                session.send(st.stanza("handshake"));
 -      
 +
                return true;
        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
        local function handle_stanza(event)
@@@ -114,7 -116,7 +116,7 @@@
                end
                return true;
        end
 -      
 +
        module:hook("iq/bare", handle_stanza, -1);
        module:hook("message/bare", handle_stanza, -1);
        module:hook("presence/bare", handle_stanza, -1);
@@@ -270,13 -272,17 +272,17 @@@ function listener.onconnect(conn
        session.log = logger.init(conn_name);
        session.close = session_close;
  
 -      
+       if opt_keepalives then
+               conn:setoption("keepalive", opt_keepalives);
+       end
++
        session.log("info", "Incoming Jabber component connection");
 -      
 +
        local stream = new_xmpp_stream(session, stream_callbacks);
        session.stream = stream;
 -      
 +
        session.notopen = true;
 -      
 +
        function session.reset_stream()
                session.notopen = true;
                session.stream:reset();
@@@ -288,7 -294,7 +294,7 @@@
                module:log("debug", "Received invalid XML (%s) %d bytes: %s", tostring(err), #data, data:sub(1, 300):gsub("[\r\n]+", " "):gsub("[%z\1-\31]", "_"));
                session:close("not-well-formed");
        end
 -      
 +
        session.dispatch_stanza = stream_callbacks.handlestanza;
  
        sessions[conn] = session;