Merge 0.10->trunk

diff --combined plugins/mod_c2s.lua
index 42c35689ca357f05b9ba8dac0470674885f95576,2829d5fdb61fe221d59f22d65d618abcf8c5ee68..a690e9be7f112931f5f77680d21c77de482b0884
--- 1/plugins/mod_c2s.lua
--- 2/plugins/mod_c2s.lua
+++ b/plugins/mod_c2s.lua
@@@ -15,10 -15,9 +15,10 @@@ local sessionmanager = require "core.se
  local st = require "util.stanza";
  local sm_new_session, sm_destroy_session = sessionmanager.new_session, sessionmanager.destroy_session;
  local uuid_generate = require "util.uuid".generate;
 +local runner = require "util.async".runner;
  
  local xpcall, tostring, type = xpcall, tostring, type;
 -local traceback = debug.traceback;
 +local t_insert, t_remove = table.insert, table.remove;
  
  local xmlns_xmpp_streams = "urn:ietf:params:xml:ns:xmpp-streams";
  
@@@ -36,7 -35,6 +36,7 @@@ local hosts = prosody.hosts
  
  local stream_callbacks = { default_ns = "jabber:client" };
  local listener = {};
 +local runner_callbacks = {};
  
  --- Stream events handlers
  local stream_xmlns_attr = {xmlns='urn:ietf:params:xml:ns:xmpp-streams'};
@@@ -123,9 -121,12 +123,9 @@@ function stream_callbacks.error(session
        end
  end
  
 -local function handleerr(err) log("error", "Traceback[c2s]: %s", traceback(tostring(err), 2)); end
  function stream_callbacks.handlestanza(session, stanza)
        stanza = session.filter("stanzas/in", stanza);
 -      if stanza then
 -              return xpcall(function () return core_process_stanza(session, stanza) end, handleerr);
 -      end
 +      session.thread:run(stanza);
  end
  
  --- Session methods
@@@ -178,6 -179,9 +178,9 @@@ local function session_close(session, r
                        sm_destroy_session(session, reason);
                        conn:close();
                end
+       else
+               local reason = (reason and (reason.name or reason.text or reason.condition)) or reason;
+               sm_destroy_session(session, reason);
        end
  end
  
@@@ -191,18 -195,6 +194,18 @@@ module:hook_global("user-deleted", func
        end
  end, 200);
  
 +function runner_callbacks:ready()
 +      self.data.conn:resume();
 +end
 +
 +function runner_callbacks:waiting()
 +      self.data.conn:pause();
 +end
 +
 +function runner_callbacks:error(err)
 +      (self.data.log or log)("error", "Traceback[c2s]: %s", err);
 +end
 +
  --- Port listener
  function listener.onconnect(conn)
        measure_connections(1);
@@@ -240,10 -232,6 +243,10 @@@
                session.stream:reset();
        end
  
 +      session.thread = runner(function (stanza)
 +              core_process_stanza(session, stanza);
 +      end, runner_callbacks, session);
 +
        local filter = session.filter;
        function session.data(data)
                -- Parse the data, which will store stanzas in session.pending_stanzas