projects
/
prosody.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ejabberdsql2prosody: Allow for multiple INSERTs to the same table
[prosody.git]
/
net
/
xmppclient_listener.lua
diff --git
a/net/xmppclient_listener.lua
b/net/xmppclient_listener.lua
index dbb87b912e934ff22631250f164bb7da78c1494a..e882546f265cbf256ccd76d1deb24f61e713983f 100644
(file)
--- a/
net/xmppclient_listener.lua
+++ b/
net/xmppclient_listener.lua
@@
-1,4
+1,4
@@
--- Prosody IM
v0.4
+-- Prosody IM
-- Copyright (C) 2008-2009 Matthew Wild
-- Copyright (C) 2008-2009 Waqas Hussain
--
-- Copyright (C) 2008-2009 Matthew Wild
-- Copyright (C) 2008-2009 Waqas Hussain
--
@@
-61,6
+61,7
@@
local function session_reset_stream(session)
function session.data(conn, data)
local ok, err = parser:parse(data);
if ok then return; end
function session.data(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]+", " "));
session:close("xml-not-well-formed");
end
session:close("xml-not-well-formed");
end
@@
-95,7
+96,7
@@
local function session_close(session, reason)
end
session.send("</stream:stream>");
session.conn.close();
end
session.send("</stream:stream>");
session.conn.close();
- xmppclient.disconnect(session.conn,
"stream error
");
+ xmppclient.disconnect(session.conn,
(reason and (reason.text or reason.condition)) or reason or "session closed
");
end
end
end
end
@@
-115,6
+116,11
@@
function xmppclient.listener(conn, data)
session.log("info", "Client connected");
session.log("info", "Client connected");
+ -- Client is using legacy SSL (otherwise mod_tls sets this flag)
+ if conn.ssl() then
+ session.secure = true;
+ end
+
session.reset_stream = session_reset_stream;
session.close = session_close;
session.reset_stream = session_reset_stream;
session.close = session_close;
@@
-131,7
+137,7
@@
function xmppclient.disconnect(conn, err)
local session = sessions[conn];
if session then
(session.log or log)("info", "Client disconnected: %s", err);
local session = sessions[conn];
if session then
(session.log or log)("info", "Client disconnected: %s", err);
- sm_destroy_session(session);
+ sm_destroy_session(session
, err
);
sessions[conn] = nil;
session = nil;
collectgarbage("collect");
sessions[conn] = nil;
session = nil;
collectgarbage("collect");