From 86905bacbb245e4322ecef8f8eb37af05f9d80db Mon Sep 17 00:00:00 2001 From: Matthew Wild Date: Sun, 12 Jul 2009 20:25:02 +0100 Subject: net.server: Correct fix for SSL traceback earlier --- net/server.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/server.lua b/net/server.lua index 78f79b56..12502412 100644 --- a/net/server.lua +++ b/net/server.lua @@ -546,7 +546,7 @@ wrapconnection = function( server, listeners, socket, ip, serverport, clientport socket:settimeout( 0 ) handler.readbuffer = handshake handler.sendbuffer = handshake - if not handshake( socket ) then -- do handshake + if not socket then -- do handshake return nil, nil, "ssl handshake failed"; end else -- cgit v1.2.3 From c9d670551e952b93f6a2fe6f8493bdba6234298b Mon Sep 17 00:00:00 2001 From: Matthew Wild Date: Sun, 12 Jul 2009 20:32:38 +0100 Subject: net.server: Fix copyright header line endings and text --- net/server.lua | 22 ++++++---------------- 1 file changed, 6 insertions(+), 16 deletions(-) diff --git a/net/server.lua b/net/server.lua index 12502412..e4230457 100644 --- a/net/server.lua +++ b/net/server.lua @@ -1,19 +1,9 @@ --- Prosody IM --- Copyright (C) 2008-2009 Matthew Wild --- Copyright (C) 2008-2009 Waqas Hussain --- --- This project is MIT/X11 licensed. Please see the --- COPYING file in the source package for more information. --- - ---[[ - - server.lua by blastbeat - - - this script contains the server loop of the program - - other scripts can reg a server here - -]]-- +-- +-- server.lua by blastbeat of the luadch project +-- Re-used here under the MIT/X Consortium License +-- +-- Modifications (C) 2008-2009 Matthew Wild, Waqas Hussain +-- -- // wrapping luadch stuff // -- -- cgit v1.2.3