diff options
| author | Kim Alvefur <zash@zash.se> | 2016-04-02 17:13:12 +0200 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2016-04-02 17:13:12 +0200 |
| commit | 0ef7cd43e5d98a3365de336cee70eac1cfdeb5e7 (patch) | |
| tree | 53679081d88331034afaa2bea1ac671a886d597a | |
| parent | 41aae0c0c5349de539b4d6805d73849823c25340 (diff) | |
| parent | 72ec06240f97cca6d2dfdb73ac721c6dbdb86193 (diff) | |
| download | prosody-0ef7cd43e5d98a3365de336cee70eac1cfdeb5e7.tar.gz prosody-0ef7cd43e5d98a3365de336cee70eac1cfdeb5e7.zip | |
Merge 0.10->trunk
| -rw-r--r-- | core/storagemanager.lua | 2 | ||||
| -rw-r--r-- | plugins/mod_bosh.lua | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/core/storagemanager.lua b/core/storagemanager.lua index 2d6d93f6..cadae0ed 100644 --- 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 408ed37f..a567c605 100644 --- 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]; |