# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1547123577 -3600
# Node ID ce5b2a149575604cf6cbb9085f603ba1fe591202
# Parent  b16780e7939f4ed6220ac828da263df4aa956ab9# Parent  2e07d2f7159941a23084f6ead0c2aa7e86d3823c
Merge 0.11->trunk

diff -r b16780e7939f -r ce5b2a149575 .hgtags
--- 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
diff -r b16780e7939f -r ce5b2a149575 plugins/mod_bosh.lua
--- 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" });