Merge 0.10->trunk

diff --combined core/storagemanager.lua
index 2d6d93f697004cac5b1061683c041a61ff598fd7,8d83f677db81104b8690577a4d1cf8668baae72b..cadae0ed13aac80e518f5f3976ceb1d686694af8
--- 1/core/storagemanager.lua
--- 2/core/storagemanager.lua
+++ b/core/storagemanager.lua
@@@ -136,7 -136,7 +136,7 @@@ local map_shim_mt = 
        };
  }
  
 -local open;
 +local open; -- forward declaration
  
  local function create_map_shim(host, store)
        local keyval_store, err = open(host, store, "keyval");
@@@ -196,7 -196,7 +196,7 @@@ en
  function datamanager.users(host, datastore, typ)
        local driver = open(host, datastore, typ);
        if not driver.users then
-               return function() log("warn", "storage driver %s does not support listing users", driver.name) end
+               return function() log("warn", "Storage driver %s does not support listing users", driver.name) end
        end
        return driver:users();
  end

diff --combined plugins/mod_bosh.lua
index 408ed37fc5db0b836dc8dda204275611e7cb7a49,032b20a82fe2c426289a71a25841cd83401c7b9d..a567c605f8e0feb207a7876bdc7ebc95f5afa6e4
--- 1/plugins/mod_bosh.lua
--- 2/plugins/mod_bosh.lua
+++ b/plugins/mod_bosh.lua
@@@ -22,7 -22,6 +22,7 @@@ local initialize_filters = require "uti
  local math_min = math.min;
  local xpcall, tostring, type = xpcall, tostring, type;
  local traceback = debug.traceback;
 +local runner = require"util.async".runner;
  
  local xmlns_streams = "http://etherx.jabber.org/streams";
  local xmlns_xmpp_streams = "urn:ietf:params:xml:ns:xmpp-streams";
@@@ -63,11 -62,13 +63,11 @@@ local t_insert, t_remove, t_concat = ta
  local os_time = os.time;
  
  -- All sessions, and sessions that have no requests open
 -local sessions, inactive_sessions = module:shared("sessions", "inactive_sessions");
 +local sessions = module:shared("sessions");
  
  -- Used to respond to idle sessions (those with waiting requests)
 -local waiting_requests = module:shared("waiting_requests");
  function on_destroy_request(request)
        log("debug", "Request destroyed: %s", tostring(request));
 -      waiting_requests[request] = nil;
        local session = sessions[request.context.sid];
        if session then
                local requests = session.requests;
@@@ -81,24 -82,9 +81,24 @@@
                -- If this session now has no requests open, mark it as inactive
                local max_inactive = session.bosh_max_inactive;
                if max_inactive and #requests == 0 then
 -                      inactive_sessions[session] = os_time() + max_inactive;
 +                      if session.inactive_timer then
 +                              session.inactive_timer:stop();
 +                      end
 +                      session.inactive_timer = module:add_timer(max_inactive, check_inactive, session, request.context,
 +                              "BOSH client silent for over "..max_inactive.." seconds");
                        (session.log or log)("debug", "BOSH session marked as inactive (for %ds)", max_inactive);
                end
 +              if session.bosh_wait_timer then
 +                      session.bosh_wait_timer:stop();
 +                      session.bosh_wait_timer = nil;
 +              end
 +      end
 +end
 +
 +function check_inactive(now, session, context, reason)
 +      if not sessions.destroyed then
 +              sessions[context.sid] = nil;
 +              sm_destroy_session(session, reason);
        end
  end
  
@@@ -132,7 -118,7 +132,7 @@@ function handle_POST(event
        local headers = response.headers;
        headers.content_type = "text/xml; charset=utf-8";
  
 -      if cross_domain and event.request.headers.origin then
 +      if cross_domain and request.headers.origin then
                set_cross_domain_headers(response);
        end
  
@@@ -153,14 -139,8 +153,14 @@@
        if session then
                -- Session was marked as inactive, since we have
                -- a request open now, unmark it
 -              if inactive_sessions[session] and #session.requests > 0 then
 -                      inactive_sessions[session] = nil;
 +              if session.inactive_timer and #session.requests > 0 then
 +                      session.inactive_timer:stop();
 +                      session.inactive_timer = nil;
 +              end
 +
 +              if session.bosh_wait_timer then
 +                      session.bosh_wait_timer:stop();
 +                      session.bosh_wait_timer = nil;
                end
  
                local r = session.requests;
@@@ -189,7 -169,7 +189,7 @@@
                        -- We're keeping this request open, to respond later
                        log("debug", "Have nothing to say, so leaving request unanswered for now");
                        if session.bosh_wait then
 -                              waiting_requests[response] = os_time() + session.bosh_wait;
 +                              session.bosh_wait_timer = module:add_timer(session.bosh_wait, after_bosh_wait, request, session)
                        end
                end
  
@@@ -205,11 -185,6 +205,11 @@@
        return 400;
  end
  
 +function after_bosh_wait(now, request, session)
 +      if request.conn then
 +              session.send("");
 +      end
 +end
  
  local function bosh_reset_stream(session) session.notopen = true; end
  
@@@ -249,11 -224,10 +249,11 @@@ local function bosh_close_stream(sessio
                held_request:send(response_body);
        end
        sessions[session.sid] = nil;
 -      inactive_sessions[session] = nil;
        sm_destroy_session(session);
  end
  
 +local runner_callbacks = { };
 +
  -- Handle the <body> tag in the request payload.
  function stream_callbacks.streamopened(context, attr)
        local request, response = context.request, context.response;
@@@ -286,10 -260,6 +286,10 @@@
                };
                sessions[sid] = session;
  
 +              session.thread = runner(function (stanza)
 +                      session:dispatch_stanza(stanza);
 +              end, runner_callbacks, session);
 +
                local filter = initialize_filters(session);
  
                session.log("debug", "BOSH session created for request from %s", session.ip);
@@@ -309,6 -279,7 +309,7 @@@
                        end
                        s = filter("stanzas/out", s);
                        --log("debug", "Sending BOSH data: %s", tostring(s));
+                       if not s then return true end
                        t_insert(session.send_buffer, tostring(s));
  
                        local oldest_request = r[1];
@@@ -387,11 -358,6 +388,11 @@@
  end
  
  local function handleerr(err) log("error", "Traceback[bosh]: %s", traceback(tostring(err), 2)); end
 +
 +function runner_callbacks:error(err)
 +      return handleerr(err);
 +end
 +
  function stream_callbacks.handlestanza(context, stanza)
        if context.ignore then return; end
        log("debug", "BOSH stanza received: %s\n", stanza:top_tag());
@@@ -401,7 -367,9 +402,7 @@@
                        stanza.attr.xmlns = nil;
                end
                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
  end
  
@@@ -432,6 -400,44 +433,6 @@@ function stream_callbacks.error(context
        end
  end
  
 -local dead_sessions = module:shared("dead_sessions");
 -function on_timer()
 -      -- log("debug", "Checking for requests soon to timeout...");
 -      -- Identify requests timing out within the next few seconds
 -      local now = os_time() + 3;
 -      for request, reply_before in pairs(waiting_requests) do
 -              if reply_before <= now then
 -                      log("debug", "%s was soon to timeout (at %d, now %d), sending empty response", tostring(request), reply_before, now);
 -                      -- Send empty response to let the
 -                      -- client know we're still here
 -                      if request.conn then
 -                              sessions[request.context.sid].send("");
 -                      end
 -              end
 -      end
 -
 -      now = now - 3;
 -      local n_dead_sessions = 0;
 -      for session, close_after in pairs(inactive_sessions) do
 -              if close_after < now then
 -                      (session.log or log)("debug", "BOSH client inactive too long, destroying session at %d", now);
 -                      sessions[session.sid]  = nil;
 -                      inactive_sessions[session] = nil;
 -                      n_dead_sessions = n_dead_sessions + 1;
 -                      dead_sessions[n_dead_sessions] = session;
 -              end
 -      end
 -
 -      for i=1,n_dead_sessions do
 -              local session = dead_sessions[i];
 -              dead_sessions[i] = nil;
 -              sm_destroy_session(session, "BOSH client silent for over "..session.bosh_max_inactive.." seconds");
 -      end
 -      return 1;
 -end
 -module:add_timer(1, on_timer);
 -
 -
  local GET_response = {
        headers = {
                content_type = "text/html";