Comparison

mod_bosh: Fix for 7be8f649d97d to skip error handling and allow other modules to handle the request

comparison

equal deleted inserted replaced

-:81d305bbe7bc
+:d5ff0982d3e6
 				session.bosh_wait_timer = module:add_timer(session.bosh_wait, after_bosh_wait, session.requests[1], session)
 			end
 			return true; -- Inform http server we shall reply later
 		end
-	elseif response.finished then
+	elseif response.finished or context.ignore_request then
-		return; -- A response has been sent already
+		-- A response has been sent already, or we're ignoring this request
+		-- (e.g. so a different instance of the module can handle it)
+		return;
 	end
 	module:log("warn", "Unable to associate request with a session (incomplete request?)");
 	local close_reply = st.stanza("body", { xmlns = xmlns_bosh, type = "terminate",
 		["xmlns:stream"] = xmlns_streams, condition = "item-not-found" });
 	return tostring(close_reply) .. "\n";
 			response:send(tostring(close_reply));
 			return;
 		elseif to_host ~= module.host then
 			-- Could be meant for a different instance of the module
 			-- if multiple instances are loaded with the same URL then this can happen
-			return; --> 404
+			context.ignore_request = true;
+			return;
 		end
 		if not rid or (not wait and attr.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" });