aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2009-07-13 21:17:51 +0100
committerMatthew Wild <mwild1@gmail.com>2009-07-13 21:17:51 +0100
commit3f0c5c91e393ef93d6df18fbbc73f5ee8d47bc2f (patch)
tree6ab19f6c791a94069d6f8bbe33e04e6c3df71df1
parentc9d670551e952b93f6a2fe6f8493bdba6234298b (diff)
downloadprosody-3f0c5c91e393ef93d6df18fbbc73f5ee8d47bc2f.tar.gz
prosody-3f0c5c91e393ef93d6df18fbbc73f5ee8d47bc2f.zip
net.server: Initiate the handshake when we should, the more correcter fix for the previous correct fix
-rw-r--r--net/server.lua3
1 files changed, 2 insertions, 1 deletions
diff --git a/net/server.lua b/net/server.lua
index e4230457..da65fce2 100644
--- a/net/server.lua
+++ b/net/server.lua
@@ -536,7 +536,8 @@ wrapconnection = function( server, listeners, socket, ip, serverport, clientport
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