prosody
30c548e1d517
net/server.lua

Find changesets by keywords by author, files, the commit message, revision number or hash, or revset expression.

Software / code / prosody

Diff

net/server.lua @ 1547:30c548e1d517

Merge with 0.5
author Matthew Wild <mwild1@gmail.com>
date Mon, 13 Jul 2009 21:18:43 +0100
parent 1546:7d7bf705675d
child 1570:a46453758631
line wrap: on
line diff
--- 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