prosody
294c359a05f5
core/modulemanager.lua

Find changesets by keywords by author, files, the commit message, revision number or hash, or revset expression.

Software / code / prosody

Comparison

core/modulemanager.lua @ 2951:294c359a05f5

Merge 0.6->0.7
author Matthew Wild <mwild1@gmail.com>
date Tue, 30 Mar 2010 19:45:56 +0100
parent 2925:692b3c6c5bd2
parent 2949:ef19faa7d106
child 2977:686f9a5a7f5e
comparison
equal deleted inserted replaced
2947:ff7f6668b34f 2951:294c359a05f5
272 if handlers then 272 if handlers then
273 log("debug", "Passing stanza to mod_%s", handler_info[handlers[1]].name); 273 log("debug", "Passing stanza to mod_%s", handler_info[handlers[1]].name);
274 (handlers[1])(origin, stanza); 274 (handlers[1])(origin, stanza);
275 return true; 275 return true;
276 else 276 else
277 if stanza.attr.xmlns == "jabber:client" then 277 if stanza.attr.xmlns == nil then
278 log("debug", "Unhandled %s stanza: %s; xmlns=%s", origin.type, stanza.name, xmlns); -- we didn't handle it 278 log("debug", "Unhandled %s stanza: %s; xmlns=%s", origin.type, stanza.name, xmlns); -- we didn't handle it
279 if stanza.attr.type ~= "error" and stanza.attr.type ~= "result" then 279 if stanza.attr.type ~= "error" and stanza.attr.type ~= "result" then
280 origin.send(st.error_reply(stanza, "cancel", "service-unavailable")); 280 origin.send(st.error_reply(stanza, "cancel", "service-unavailable"));
281 end 281 end
282 elseif not((name == "features" or name == "error") and xmlns == "http://etherx.jabber.org/streams") then -- FIXME remove check once we handle S2S features 282 elseif not((name == "features" or name == "error") and xmlns == "http://etherx.jabber.org/streams") then -- FIXME remove check once we handle S2S features