prosody: Added a stub implementation of core.componentmanager to the package.loaded...

[prosody.git] / util / xmppstream.lua

diff --git a/util/xmppstream.lua b/util/xmppstream.lua
index d22c923b6f7987781556d5863331ccda4a95379e..90580ff2bade977a572affe6f30197f55b61102e 100644 (file)
--- a/util/xmppstream.lua
+++ b/util/xmppstream.lua
@@ -14,7 +14,7 @@ local tostring = tostring;
 local t_insert = table.insert;
 local t_concat = table.concat;
 
-local default_log = require "util.logger".init("xmlhandlers");
+local default_log = require "util.logger".init("xmppstream");
 
 local error = error;
 
@@ -48,6 +48,7 @@ function new_sax_handlers(session, stream_callbacks)
        local stream_default_ns = stream_callbacks.default_ns;
        
        local chardata, stanza = {};
+       local non_streamns_depth = 0;
        function xml_handlers:StartElement(tagname, attr)
                if stanza and #chardata > 0 then
                        -- We have some character data in the buffer
@@ -59,8 +60,9 @@ function new_sax_handlers(session, stream_callbacks)
                        curr_ns, name = "", curr_ns;
                end
 
-               if curr_ns ~= stream_default_ns then
+               if curr_ns ~= stream_default_ns or non_streamns_depth > 0 then
                        attr.xmlns = curr_ns;
+                       non_streamns_depth = non_streamns_depth + 1;
                end
                
                -- FIXME !!!!!
@@ -69,8 +71,8 @@ function new_sax_handlers(session, stream_callbacks)
                        attr[i] = nil;
                        local ns, nm = k:match(ns_pattern);
                        if nm ~= "" then
-                               ns = ns_prefixes[ns]; 
-                               if ns then 
+                               ns = ns_prefixes[ns];
+                               if ns then
                                        attr[ns..":"..nm] = attr[k];
                                        attr[k] = nil;
                                end
@@ -80,6 +82,7 @@ function new_sax_handlers(session, stream_callbacks)
                if not stanza then --if we are not currently inside a stanza
                        if session.notopen then
                                if tagname == stream_tag then
+                                       non_streamns_depth = 0;
                                        if cb_streamopened then
                                                cb_streamopened(session, attr);
                                        end
@@ -104,6 +107,9 @@ function new_sax_handlers(session, stream_callbacks)
                end
        end
        function xml_handlers:EndElement(tagname)
+               if non_streamns_depth > 0 then
+                       non_streamns_depth = non_streamns_depth - 1;
+               end
                if stanza then
                        if #chardata > 0 then
                                -- We have some character data in the buffer
@@ -111,7 +117,8 @@ function new_sax_handlers(session, stream_callbacks)
                                chardata = {};
                        end
                        -- Complete stanza
-                       if #stanza.last_add == 0 then
+                       local last_add = stanza.last_add;
+                       if not last_add or #last_add == 0 then
                                if tagname ~= stream_error_tag then
                                        cb_handlestanza(session, stanza);
                                else