diff options
| author | Matthew Wild <mwild1@gmail.com> | 2009-07-13 21:18:43 +0100 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2009-07-13 21:18:43 +0100 |
| commit | 23151a9316278647e44d0d790317d75f33cdfd93 (patch) | |
| tree | 1e0930bba38d1a2d2d5c66ee2b5bc414e1aada71 | |
| parent | 804484e5303a75779f918bacce4380bd63ce6f73 (diff) | |
| parent | 3f0c5c91e393ef93d6df18fbbc73f5ee8d47bc2f (diff) | |
| download | prosody-23151a9316278647e44d0d790317d75f33cdfd93.tar.gz prosody-23151a9316278647e44d0d790317d75f33cdfd93.zip | |
Merge with 0.5
| -rw-r--r-- | net/server.lua | 3 |
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
|