aboutsummaryrefslogtreecommitdiffstats
path: root/net/xmppserver_listener.lua
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2009-10-14 14:12:14 +0100
committerMatthew Wild <mwild1@gmail.com>2009-10-14 14:12:14 +0100
commit1f3374a1300f5915e1b40728bdf4fe8b39ae114e (patch)
treedc07325149c3f984a279d757512c0e779aadbde1 /net/xmppserver_listener.lua
parent257023aae10ea18352719f60fc963a219dcfad7b (diff)
parent68f948425a7f0665fbbea3b35393f23eec256516 (diff)
downloadprosody-1f3374a1300f5915e1b40728bdf4fe8b39ae114e.tar.gz
prosody-1f3374a1300f5915e1b40728bdf4fe8b39ae114e.zip
Merge with 0.5
Diffstat (limited to 'net/xmppserver_listener.lua')
-rw-r--r--net/xmppserver_listener.lua3
1 files changed, 3 insertions, 0 deletions
diff --git a/net/xmppserver_listener.lua b/net/xmppserver_listener.lua
index 831f7c3c..ccea1170 100644
--- a/net/xmppserver_listener.lua
+++ b/net/xmppserver_listener.lua
@@ -100,6 +100,9 @@ local function session_close(session, reason)
end
end
session.sends2s("</stream:stream>");
+ if sesson.notopen or not session.conn.close() then
+ session.conn.close(true); -- Force FIXME: timer?
+ end
session.conn.close();
xmppserver.disconnect(session.conn, "stream error");
end