function init_xmlhandlers(session, stream_callbacks)
local ns_stack = { "" };
- local curr_ns, name = "";
local curr_tag;
local chardata = {};
local xml_handlers = {};
stanza:text(t_concat(chardata));
chardata = {};
end
- local curr_ns,name = tagname:match("^(.-)|?([^%|]-)$");
- if not name then
+ local curr_ns,name = tagname:match("^([^\1]*)\1?(.*)$");
+ if name == "" then
curr_ns, name = "", curr_ns;
end
for i=1,#attr do
local k = attr[i];
attr[i] = nil;
- local ns, nm = k:match("^([^|]+)|?([^|]-)$")
- if ns and nm then
+ local ns, nm = k:match("^([^\1]*)\1?(.*)$");
+ if nm ~= "" then
ns = ns_prefixes[ns];
if ns then
attr[ns..":"..nm] = attr[k];
end
end
function xml_handlers:EndElement(tagname)
- curr_ns,name = tagname:match("^(.-)|?([^%|]-)$");
- if not name then
+ local curr_ns,name = tagname:match("^([^\1]*)\1?(.*)$");
+ if name == "" then
curr_ns, name = "", curr_ns;
end
if (not stanza) or (#stanza.last_add > 0 and name ~= stanza.last_add[#stanza.last_add].name) then
if cb_streamclosed then
cb_streamclosed(session);
end
- return;
elseif name == "error" then
cb_error(session, "stream-error", stanza);
else
cb_error(session, "parse-error", "unexpected-element-close", name);
end
+ stanza, chardata = nil, {};
+ return;
end
if #chardata > 0 then
-- We have some character data in the buffer