# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1226795413 0
# Node ID b7a24b0ce767a67a539e880865e78628f313142e
# Parent  4a8a949c3870af1e04d6f35dc301245dcf9b50b1# Parent  dcb5bce69a0f4ef9c05721c5cb1a1008ce73abeb
Merge with waqas

diff -r dcb5bce69a0f -r b7a24b0ce767 net/server.lua
--- a/net/server.lua	Sun Nov 16 05:06:38 2008 +0500
+++ b/net/server.lua	Sun Nov 16 00:30:13 2008 +0000
@@ -523,6 +523,8 @@
 			return receive( socket, pattern, prefix )
 		end
 		
+		handler.starttls = nil;
+		
 			handler.handshake = coroutine_wrap( function( client )
 					local err
 					for i = 1, 10 do    -- 10 handshake attemps
diff -r dcb5bce69a0f -r b7a24b0ce767 net/xmppclient_listener.lua
--- a/net/xmppclient_listener.lua	Sun Nov 16 05:06:38 2008 +0500
+++ b/net/xmppclient_listener.lua	Sun Nov 16 00:30:13 2008 +0000
@@ -82,7 +82,7 @@
 			pres:tag("status"):text("Disconnected: "..err);
 			session.stanza_dispatch(pres);
 		end
-		session.log("info", "Client disconnected: %s", err);
+		(session.log or log)("info", "Client disconnected: %s", err);
 		sm_destroy_session(session);
 		sessions[conn]  = nil;
 		session = nil;