X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=net%2Fxmppserver_listener.lua;h=6b782240ef050a1e4f8f2cadea5be8683a295516;hb=5e039f92e23aeb53de8d599b4549880d58ec0519;hp=d4283d9b05b6bd4669ccfc10b9fd62255fc8cd06;hpb=e8e7e1b0b61ee35d80fecb2c465eb34169d445ba;p=prosody.git

diff --git a/net/xmppserver_listener.lua b/net/xmppserver_listener.lua
index d4283d9b..6b782240 100644
--- a/net/xmppserver_listener.lua
+++ b/net/xmppserver_listener.lua
@@ -27,7 +27,7 @@ function stream_callbacks.error(session, error, data)
 		session:close("invalid-namespace");
 	elseif error == "parse-error" then
 		session.log("debug", "Server-to-server XML parse error: %s", tostring(error));
-		session:close("xml-not-well-formed");
+		session:close("not-well-formed");
 	elseif error == "stream-error" then
 		local condition, text = "undefined-condition";
 		for child in data:children() do
@@ -55,7 +55,7 @@ function stream_callbacks.handlestanza(session, stanza)
 	end
 	stanza = session.filter("stanzas/in", stanza);
 	if stanza then
-		xpcall(function () core_process_stanza(session, stanza) end, handleerr);
+		return xpcall(function () return core_process_stanza(session, stanza) end, handleerr);
 	end
 end
 
@@ -136,7 +136,7 @@ local function initialize_session(session)
 			if ok then return; end
 			(session.log or log)("warn", "Received invalid XML: %s", data);
 			(session.log or log)("warn", "Problem was: %s", err);
-			session:close("xml-not-well-formed");
+			session:close("not-well-formed");
 		end
 	end