Software / code / prosody
Changeset
7327:d62f0471470f
Merge 0.10->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Sat, 02 Apr 2016 17:13:12 +0200 |
| parents | 7324:7e6409462f79 (current diff) 7326:d11701e86702 (diff) |
| children | 7330:89dd1f86a48a |
| files | core/storagemanager.lua plugins/mod_bosh.lua |
| diffstat | 2 files changed, 2 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/core/storagemanager.lua Tue Mar 29 15:38:14 2016 +0200 +++ b/core/storagemanager.lua Sat Apr 02 17:13:12 2016 +0200 @@ -196,7 +196,7 @@ 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
--- a/plugins/mod_bosh.lua Tue Mar 29 15:38:14 2016 +0200 +++ b/plugins/mod_bosh.lua Sat Apr 02 17:13:12 2016 +0200 @@ -309,6 +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];
