# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1247427189 -3600
# Node ID e6bd29342f6583eed5faa4db744e8fdf842ff9bf
# Parent  e5d5f864c12544be1e53087364a14c4fedce1f88# Parent  c7f0938bc33e3a0c62677a20024663efc1a400e1
Merge with 0.5

diff -r e5d5f864c125 -r e6bd29342f65 net/server.lua
--- a/net/server.lua	Sun Jul 12 19:17:14 2009 +0100
+++ b/net/server.lua	Sun Jul 12 20:33:09 2009 +0100
@@ -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 @@
             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