Merge 0.10->trunk

diff --git a/core/storagemanager.lua b/core/storagemanager.lua
index 2d6d93f697004cac5b1061683c041a61ff598fd7..cadae0ed13aac80e518f5f3976ceb1d686694af8 100644 (file)
--- a/core/storagemanager.lua
+++ b/core/storagemanager.lua
@@ -196,7 +196,7 @@ end
 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 --git a/plugins/mod_bosh.lua b/plugins/mod_bosh.lua
index 408ed37fc5db0b836dc8dda204275611e7cb7a49..a567c605f8e0feb207a7876bdc7ebc95f5afa6e4 100644 (file)
--- a/plugins/mod_bosh.lua
+++ b/plugins/mod_bosh.lua
@@ -309,6 +309,7 @@ function stream_callbacks.streamopened(context, attr)
                        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];