# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1247516323 -3600
# Node ID 30c548e1d517c5a00cf0ca583edc40b4633533a7
# Parent  e6bd29342f6583eed5faa4db744e8fdf842ff9bf# Parent  7d7bf705675d493576cacfa9db989f598d31de97
Merge with 0.5

diff -r e6bd29342f65 -r 30c548e1d517 net/server.lua
--- a/net/server.lua	Sun Jul 12 20:33:09 2009 +0100
+++ b/net/server.lua	Mon Jul 13 21:18:43 2009 +0100
@@ -536,7 +536,8 @@
             socket:settimeout( 0 )
             handler.readbuffer = handshake
             handler.sendbuffer = handshake
-            if not socket then   -- do handshake
+            handshake( socket ) -- do handshake
+            if not socket then
                 return nil, nil, "ssl handshake failed";
             end
         else