File

mod_websocket: Merge session close handling changes from mod_c2s (bug fixes) This should bring some fixes and general robustness that mod_websocket had missed out on. The duplicated code here is not at all ideal. To prevent this happening again, we should figure out how to have the common logic in a single place, while still being able to do the websocket-specific parts that we need. The main known bug that this fixes is that it's possible for a session to get into a non-destroyable state. For example, if we try to session:close() a hibernating session, then session.conn is nil and the function will simply return without doing anything. In the mod_c2s code we already handle this, and just destroy the session. But if a hibernating websocket session is never resumed or becomes non-resumable, it will become immortal! By merging the fix from mod_c2s, the session should now be correctly destroyed.

describe("util.bitcompat", function ()
	-- bitcompat will pass through to an appropriate implementation. Our
	-- goal here is to check that whatever implementation is in use passes
	-- these basic sanity checks.

	local bit = require "util.bitcompat";

	it("bor works", function ()
		assert.equal(0xF0FF, bit.bor(0xF000, 0x00F0, 0x000F));
	end);

	it("band works", function ()
		assert.equal(0x0F, bit.band(0xFF, 0x1F, 0x0F));
	end);

	it("bxor works", function ()
		assert.equal(0x13, bit.bxor(0x10, 0x0F, 0x0C));
	end);

	it("rshift works", function ()
		assert.equal(0x0F, bit.rshift(0xFF, 4));
	end);

	it("lshift works", function ()
		assert.equal(0xFF00, bit.lshift(0xFF, 8));
	end);

	it("bnot works", function ()
		assert.equal(0x0000FF00, bit.band(0xFFFFFFFF, bit.bnot(0xFFFF00FF)));
	end);
end);