util.xmppstream: Remove namespace tracking, it's broken as implemented
authorMatthew Wild <mwild1@gmail.com>
Sat, 5 Mar 2016 23:37:56 +0000 (23:37 +0000)
committerMatthew Wild <mwild1@gmail.com>
Sat, 5 Mar 2016 23:37:56 +0000 (23:37 +0000)
The code fails to handle namespaces on the initial opening tag (when 'stanza' is nil). Fixing this
seems not worth the effort for a feature that is not being used.

util/xmppstream.lua

index 3d97acef1c87fde71187170435f8a3ac2c779707..7be63285dfdb48c8d219cab5190e930ffdaa6b9d 100644 (file)
@@ -196,29 +196,6 @@ local function new_sax_handlers(session, stream_callbacks, cb_handleprogress)
                end
        end
 
-       if stream_callbacks.track_namespaces then
-               local namespaces = {}
-               function xml_handlers:StartNamespaceDecl(prefix, url)
-                       if prefix ~= nil then
-                               namespaces[prefix] = url
-                       end
-               end
-               function xml_handlers:EndNamespaceDecl(prefix)
-                       if prefix ~= nil then
-                               namespaces[prefix] = nil
-                       end
-               end
-               local old_startelement = xml_handlers.StartElement
-               function xml_handlers:StartElement(tagname, attr)
-                       old_startelement(self, tagname, attr)
-                       local n = {}
-                       for prefix, url in pairs(namespaces) do
-                               n[prefix] = url
-                       end
-                       stanza.namespaces = n
-               end
-       end
-
        local function restricted_handler(parser)
                cb_error(session, "parse-error", "restricted-xml", "Restricted XML, see RFC 6120 section 11.1.");
                if not parser.stop or not parser:stop() then