Merge 0.9->0.10

diff --cc plugins/mod_component.lua
index 3eaacb8eaf123994cea5237db7163c11b51cf5a4,c5a1da81ce49e3f920eae0dab735d92977043c3e..1497b12fc6a0096661aae5e1345cab9f25c4be52
--- 1/plugins/mod_component.lua
--- 2/plugins/mod_component.lua
+++ b/plugins/mod_component.lua
@@@ -83,10 -85,10 +85,10 @@@ function module.add_host(module
                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)
@@@ -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();