net.server: Don't close handler if it is already nil when SSL handshake fails

[prosody.git] / net / xmppclient_listener.lua

diff --git a/net/xmppclient_listener.lua b/net/xmppclient_listener.lua
index dbb87b912e934ff22631250f164bb7da78c1494a..35838692ec6f76fc5af49210b32170c57551cf16 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
 -- 
@@ -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 and reason.condition) or reason or "session closed");
        end
 end
 
@@ -115,6 +115,11 @@ function xmppclient.listener(conn, data)
                
                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;
                
@@ -131,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");