aboutsummaryrefslogtreecommitdiffstats
path: root/net/xmppclient_listener.lua
diff options
context:
space:
mode:
authorWaqas Hussain <waqas20@gmail.com>2009-06-28 21:32:19 +0500
committerWaqas Hussain <waqas20@gmail.com>2009-06-28 21:32:19 +0500
commite0b4f8cb2133898d410a0f376f2a918b05fe5afb (patch)
treee5b5321a680cf735d182a48a6a0cb0583e1b2e35 /net/xmppclient_listener.lua
parentf79a4c31bd44cab20a27399ab2f8b712c7055784 (diff)
parent9a3cf5cc0098f3a3b3f8a29d90bc1dae22837aff (diff)
downloadprosody-e0b4f8cb2133898d410a0f376f2a918b05fe5afb.tar.gz
prosody-e0b4f8cb2133898d410a0f376f2a918b05fe5afb.zip
Merged with trunk
Diffstat (limited to 'net/xmppclient_listener.lua')
-rw-r--r--net/xmppclient_listener.lua4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/xmppclient_listener.lua b/net/xmppclient_listener.lua
index 617f0467..5e1a1ba3 100644
--- a/net/xmppclient_listener.lua
+++ b/net/xmppclient_listener.lua
@@ -95,7 +95,7 @@ local function session_close(session, reason)
end
session.send("</stream:stream>");
session.conn.close();
- xmppclient.disconnect(session.conn, "stream error");
+ xmppclient.disconnect(session.conn, reason.condition or reason or "session closed");
end
end
@@ -136,7 +136,7 @@ function xmppclient.disconnect(conn, 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");