diff options
| author | Matthew Wild <mwild1@gmail.com> | 2009-07-12 20:33:09 +0100 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2009-07-12 20:33:09 +0100 |
| commit | 804484e5303a75779f918bacce4380bd63ce6f73 (patch) | |
| tree | 6d7713c0e367ce50278360ae532b5b011405c720 | |
| parent | d9d11e5d9ca5c7ae51e4a2d5960a5adaac37f228 (diff) | |
| parent | c9d670551e952b93f6a2fe6f8493bdba6234298b (diff) | |
| download | prosody-804484e5303a75779f918bacce4380bd63ce6f73.tar.gz prosody-804484e5303a75779f918bacce4380bd63ce6f73.zip | |
Merge with 0.5
| -rw-r--r-- | net/server.lua | 24 |
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
|