Mercurial Mercurial > prosody > prosody / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
net.server: Initiate the handshake when we should, the more correcter fix for the previous correct fix
authorMatthew Wild <mwild1@gmail.com>
Mon, 13 Jul 2009 21:17:51 +0100
changeset 1546 7d7bf705675d
parent 1544 c7f0938bc33e
child 1547 30c548e1d517
child 1548 b88b30c9e688
net.server: Initiate the handshake when we should, the more correcter fix for the previous correct fix
net/server.lua file | annotate | diff | comparison | revisions 
--- a/net/server.lua	Sun Jul 12 20:32:38 2009 +0100
+++ b/net/server.lua	Mon Jul 13 21:17:51 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
prosody