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.
-- Read an XML dataform and spit out a serialized Lua table of it
local function from_stanza(stanza)
local layout = {
title = stanza:get_child_text("title");
instructions = stanza:get_child_text("instructions");
};
for tag in stanza:childtags("field") do
local field = {
name = tag.attr.var;
type = tag.attr.type;
label = tag.attr.label;
desc = tag:get_child_text("desc");
required = tag:get_child("required") and true or nil;
value = tag:get_child_text("value");
options = nil;
};
if field.type == "list-single" or field.type == "list-multi" then
local options = {};
for option in tag:childtags("option") do
options[#options+1] = { label = option.attr.label, value = option:get_child_text("value") };
end
field.options = options;
end
if field.type == "jid-multi" or field.type == "list-multi" or field.type == "text-multi" then
local values = {};
for value in tag:childtags("value") do
values[#values+1] = value:get_text();
end
if field.type == "text-multi" then
values = table.concat(values, "\n");
end
field.value = values;
end
if field.type == "boolean" then
field.value = field.value == "true" or field.value == "1";
end
layout[#layout+1] = field;
end
return layout;
end
print("dataforms.new " .. require "util.serialization".serialize(from_stanza(require "util.xml".parse(io.read("*a"))), { unquoted = true }))