mod_websocket: Fire pre-session-close event (fixes #1800)
This event was added in a7c183bb4e64 and is required to make mod_smacks know
that a session was intentionally closed and shouldn't be hibernated (see
fcea4d9e7502).
Because this was missing from mod_websocket's session.close(), mod_smacks
would always attempt to hibernate websocket sessions even if they closed
cleanly.
That mod_websocket has its own copy of session.close() is something to fix
another day (probably not in the stable branch). So for now this commit makes
the minimal change to get things working again.
Thanks to Damian and the Jitsi team for reporting.
local format = require"util.format".format;
local dump = require"util.serialization".new("oneline")
local types = {
"nil";
"boolean";
"number";
"string";
"function";
-- "userdata";
"thread";
"table";
};
local example_values = {
["nil"] = { n = 1; nil };
["boolean"] = { true; false };
["number"] = { 97; -12345; 1.5; 73786976294838206464; math.huge; 2147483647 };
["string"] = { "hello"; "foo \1\2\3 bar"; "nödåtgärd"; string.sub("nödåtgärd", 1, -4) };
["function"] = { function() end };
-- ["userdata"] = {};
["thread"] = { coroutine.create(function() end) };
["table"] = { {}, setmetatable({},{__tostring=function ()return "foo \1\2\3 bar"end}) };
};
local example_strings = setmetatable({
["nil"] = { "nil" };
["function"] = { "function() end" };
["number"] = { "97"; "-12345"; "1.5"; "73786976294838206464"; "math.huge"; "2147483647" };
["thread"] = { "coroutine.create(function() end)" };
["table"] = { "{ }", "setmetatable({},{__tostring=function ()return \"foo \\1\\2\\3 bar\"end})" }
}, { __index = function() return {} end });
for _, lua_type in ipairs(types) do
print(string.format("\t\tdescribe(\"%s\", function ()", lua_type));
local examples = example_values[lua_type];
for fmt in ("cdiouxXaAeEfgGqs"):gmatch(".") do
print(string.format("\t\t\tdescribe(\"to %%%s\", function ()", fmt));
print("\t\t\t\tit(\"works\", function ()");
for i = 1, examples.n or #examples do
local example = examples[i];
if not tostring(example):match("%w+: 0[xX]%x+") then
print(string.format("\t\t\t\t\tassert.equal(%q, format(%q, %s))", format("%" .. fmt, example), "%" .. fmt,
example_strings[lua_type][i] or dump(example)));
else
print(string.format("\t\t\t\t\tassert.matches(\"[%s: 0[xX]%%x+]\", format(%q, %s))", lua_type, "%" .. fmt,
example_strings[lua_type][i] or dump(example)));
end
end
print("\t\t\t\tend);");
print("\t\t\tend);");
print()
end
print("\t\tend);");
print()
end