Software / code / prosody
Changeset
9778:ce5b2a149575
Merge 0.11->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Thu, 10 Jan 2019 13:32:57 +0100 |
| parents | 9775:b16780e7939f (current diff) 9777:2e07d2f71599 (diff) |
| children | 9779:0b04099b49de |
| files | |
| diffstat | 2 files changed, 2 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Mon Jan 07 15:42:46 2019 +0000 +++ b/.hgtags Thu Jan 10 13:32:57 2019 +0100 @@ -68,3 +68,4 @@ 83f3a05c1b1bb9b54b3b153077a06eb02e247c8e 0.11.0 91856829f18bb8ef7056ca02464122fc6de17807 0.11.1 bb8486491b48431236c0d32548c20d9853781e69 0.10.3 +4f8b6c09e5f328e3d3d4233dc78fa4fd0535171c 0.11.2
--- a/plugins/mod_bosh.lua Mon Jan 07 15:42:46 2019 +0000 +++ b/plugins/mod_bosh.lua Thu Jan 10 13:32:57 2019 +0100 @@ -277,7 +277,7 @@ 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" });
