diff options
| author | Waqas Hussain <waqas20@gmail.com> | 2010-11-20 02:33:36 +0500 |
|---|---|---|
| committer | Waqas Hussain <waqas20@gmail.com> | 2010-11-20 02:33:36 +0500 |
| commit | ecaf8a5959db86acb6152542287a56c05a6b7e1e (patch) | |
| tree | 0fc654d80a1aa6e6914680587b1d6b11598718e8 /net | |
| parent | 22ee83cf0c7f03e1d4cba8c564446a782c023708 (diff) | |
| download | prosody-ecaf8a5959db86acb6152542287a56c05a6b7e1e.tar.gz prosody-ecaf8a5959db86acb6152542287a56c05a6b7e1e.zip | |
net.xmpp{client,server,component}_listener: s/xml-not-well-formed/not-well-formed/ as per latest bis drafts.
Diffstat (limited to 'net')
| -rw-r--r-- | net/xmppclient_listener.lua | 4 | ||||
| -rw-r--r-- | net/xmppcomponent_listener.lua | 4 | ||||
| -rw-r--r-- | net/xmppserver_listener.lua | 4 |
3 files changed, 6 insertions, 6 deletions
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 |