prosody
dcb5bce69a0f%3Ab7a24b0ce767

Find changesets by keywords by author, files, the commit message, revision number or hash, or revset expression.

Software / code / prosody

Changeset

320:b7a24b0ce767

Merge with waqas
author Matthew Wild <mwild1@gmail.com>
date Sun, 16 Nov 2008 00:30:13 +0000
parents 319:4a8a949c3870 (diff) 317:dcb5bce69a0f (current diff)
children 321:31fe15ce6fac 401:96e2019d112d
files
diffstat 2 files changed, 3 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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
--- 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;