From: Waqas Hussain <waqas20@gmail.com>
Date: Fri, 19 Nov 2010 21:33:36 +0000 (+0500)
Subject: net.xmpp{client,server,component}_listener: s/xml-not-well-formed/not-well-formed... 
X-Git-Url: https://git.enpas.org/?a=commitdiff_plain;h=2f7c6103fa59195b6e86a10400a95540fa796df2;hp=313a1a88570f595b05f99c0ed30825de47643034;p=prosody.git

net.xmpp{client,server,component}_listener: s/xml-not-well-formed/not-well-formed/ as per latest bis drafts.
---

diff --git a/net/xmppclient_listener.lua b/net/xmppclient_listener.lua
index da006d0a..7cffc0ca 100644
--- a/net/xmppclient_listener.lua
+++ b/net/xmppclient_listener.lua
@@ -41,7 +41,7 @@ function stream_callbacks.error(session, error, data)
 		session:close("invalid-namespace");
 	elseif error == "parse-error" then
 		(session.log or log)("debug", "Client XML parse error: %s", tostring(data));
-		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
@@ -148,7 +148,7 @@ function xmppclient.onconnect(conn)
 			local ok, err = stream:feed(data);
 			if ok then return; end
 			log("debug", "Received invalid XML (%s) %d bytes: %s", tostring(err), #data, data:sub(1, 300):gsub("[\r\n]+", " "):gsub("[%z\1-\31]", "_"));
-			session:close("xml-not-well-formed");
+			session:close("not-well-formed");
 		end
 	end
 	
diff --git a/net/xmppcomponent_listener.lua b/net/xmppcomponent_listener.lua
index 58676565..1278f337 100644
--- a/net/xmppcomponent_listener.lua
+++ b/net/xmppcomponent_listener.lua
@@ -42,7 +42,7 @@ function stream_callbacks.error(session, error, data, data2)
 		session:close("invalid-namespace");
 	elseif error == "parse-error" then
 		session.log("warn", "External component %s XML parse error: %s", tostring(session.host), tostring(data));
-		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
@@ -186,7 +186,7 @@ function component_listener.onincoming(conn, data)
 			local ok, err = parser:parse(data);
 			if ok then return; end
 			log("debug", "Received invalid XML (%s) %d bytes: %s", tostring(err), #data, data:sub(1, 300):gsub("[\r\n]+", " "):gsub("[%z\1-\31]", "_"));
-			session:close("xml-not-well-formed");
+			session:close("not-well-formed");
 		end
 		
 		session.dispatch_stanza = stream_callbacks.handlestanza;
diff --git a/net/xmppserver_listener.lua b/net/xmppserver_listener.lua
index 05e14a0f..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
@@ -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