diff options
| author | Matthew Wild <mwild1@gmail.com> | 2009-07-12 15:23:39 +0100 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2009-07-12 15:23:39 +0100 |
| commit | c4841e0e92a8cce97c5fc3e689808aa4d63dc35a (patch) | |
| tree | f8086a815fdbdd75e96a3092a58c6294af909b60 /net/server.lua | |
| parent | 04263369c807c434ebc9094723589098145beae5 (diff) | |
| parent | 4117259212afab1c15f98eaeffb8c442cfa54c8c (diff) | |
| download | prosody-c4841e0e92a8cce97c5fc3e689808aa4d63dc35a.tar.gz prosody-c4841e0e92a8cce97c5fc3e689808aa4d63dc35a.zip | |
Merge with 0.5
Diffstat (limited to 'net/server.lua')
| -rw-r--r-- | net/server.lua | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/net/server.lua b/net/server.lua index 9418d388..78f79b56 100644 --- a/net/server.lua +++ b/net/server.lua @@ -546,7 +546,9 @@ wrapconnection = function( server, listeners, socket, ip, serverport, clientport socket:settimeout( 0 )
handler.readbuffer = handshake
handler.sendbuffer = handshake
- handshake( socket ) -- do handshake
+ if not handshake( socket ) then -- do handshake
+ return nil, nil, "ssl handshake failed";
+ end
else
-- We're not automatically doing SSL, so we're not secure (yet)
ssl = false
|