Merge 0.10->trunk

[prosody.git] / util / xml.lua

diff --git a/util/xml.lua b/util/xml.lua
index 733d821ad7c8b87dc93d7e4a0b3ab2cfa030fd85..ec06fb0159e22ec6308d79a481fda51669ea5e2d 100644 (file)
--- a/util/xml.lua
+++ b/util/xml.lua
@@ -1,6 +1,8 @@
 
 local st = require "util.stanza";
 local lxp = require "lxp";
+local t_insert = table.insert;
+local t_remove = table.remove;
 
 local _ENV = nil;
 
@@ -14,6 +16,21 @@ local parse_xml = (function()
                --luacheck: ignore 212/self
                local handler = {};
                local stanza = st.stanza("root");
+               local namespaces = {};
+               local prefixes = {};
+               function handler:StartNamespaceDecl(prefix, url)
+                       if prefix ~= nil then
+                               t_insert(namespaces, url);
+                               t_insert(prefixes, prefix);
+                       end
+               end
+               function handler:EndNamespaceDecl(prefix)
+                       if prefix ~= nil then
+                               -- we depend on each StartNamespaceDecl having a paired EndNamespaceDecl
+                               t_remove(namespaces);
+                               t_remove(prefixes);
+                       end
+               end
                function handler:StartElement(tagname, attr)
                        local curr_ns,name = tagname:match(ns_pattern);
                        if name == "" then
@@ -34,7 +51,11 @@ local parse_xml = (function()
                                        end
                                end
                        end
-                       stanza:tag(name, attr);
+                       local n = {}
+                       for i=1,#namespaces do
+                               n[prefixes[i]] = namespaces[i];
+                       end
+                       stanza:tag(name, attr, n);
                end
                function handler:CharacterData(data)
                        stanza:text(data);