aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--net/server.lua24
1 files changed, 7 insertions, 17 deletions
diff --git a/net/server.lua b/net/server.lua
index 78f79b56..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 // --
@@ -546,7 +536,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