aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2019-01-10 13:32:57 +0100
committerKim Alvefur <zash@zash.se>2019-01-10 13:32:57 +0100
commit8c87ed548da06d0d668034ec04e3527ba3b54716 (patch)
treeeca18db5a8517d12f44d7b07b1453ce03594a879
parentf78babf39d9258e217da6d1e6d4e5ee629446271 (diff)
parent5cd064035a3ea63781edff625c4f402ca7cb3670 (diff)
downloadprosody-8c87ed548da06d0d668034ec04e3527ba3b54716.tar.gz
prosody-8c87ed548da06d0d668034ec04e3527ba3b54716.zip
Merge 0.11->trunk
-rw-r--r--plugins/mod_bosh.lua2
1 files changed, 1 insertions, 1 deletions
diff --git a/plugins/mod_bosh.lua b/plugins/mod_bosh.lua
index 251ef740..d4701148 100644
--- a/plugins/mod_bosh.lua
+++ b/plugins/mod_bosh.lua
@@ -277,7 +277,7 @@ function stream_callbacks.streamopened(context, attr)
response:send(tostring(close_reply));
return;
end
- if not rid or (not wait and attr.wait or wait < 0 or wait % 1 ~= 0) then
+ if not rid or (not attr.wait or not wait or wait < 0 or wait % 1 ~= 0) then
log("debug", "BOSH client sent invalid rid or wait attributes: rid=%s, wait=%s", tostring(attr.rid), tostring(attr.wait));
local close_reply = st.stanza("body", { xmlns = xmlns_bosh, type = "terminate",
["xmlns:stream"] = xmlns_streams, condition = "bad-request" });