net.xmpp{client,server,component}_listener: s/xml-not-well-formed/not-well-formed...

diff --git a/net/xmppclient_listener.lua b/net/xmppclient_listener.lua
index da006d0ac91909263d5b3ecbbf3f763613ebc3e5..7cffc0ca92591dd5b1de6dfcaf7aa07a4f2252ad 100644 (file)
--- 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 58676565e7be70cf3896b970621d7565b8dd5a59..1278f337e3d5db5c3b4ba5fffa1a658e7b4926cc 100644 (file)
--- 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 05e14a0f86d1358d3d52bda9d8e7fada46c5e7f7..6b782240ef050a1e4f8f2cadea5be8683a295516 100644 (file)
--- 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