Software / code / prosody
Changeset
1547:30c548e1d517
Merge with 0.5
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Mon, 13 Jul 2009 21:18:43 +0100 |
| parents | 1545:e6bd29342f65 (current diff) 1546:7d7bf705675d (diff) |
| children | 1549:0461fb35f2ac |
| files | |
| diffstat | 1 files changed, 2 insertions(+), 1 deletions(-) [+] |
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
