Software /
code /
prosody
Comparison
net/server.lua @ 1543:d2d80c1cad6c
net.server: Correct fix for SSL traceback earlier
author | Matthew Wild <mwild1@gmail.com> |
---|---|
date | Sun, 12 Jul 2009 20:25:02 +0100 |
parent | 1535:0afc8ae01515 |
child | 1544:c7f0938bc33e |
comparison
equal
deleted
inserted
replaced
1541:591732da1306 | 1543:d2d80c1cad6c |
---|---|
544 return nil, nil, err -- fatal error | 544 return nil, nil, err -- fatal error |
545 end | 545 end |
546 socket:settimeout( 0 ) | 546 socket:settimeout( 0 ) |
547 handler.readbuffer = handshake | 547 handler.readbuffer = handshake |
548 handler.sendbuffer = handshake | 548 handler.sendbuffer = handshake |
549 if not handshake( socket ) then -- do handshake | 549 if not socket then -- do handshake |
550 return nil, nil, "ssl handshake failed"; | 550 return nil, nil, "ssl handshake failed"; |
551 end | 551 end |
552 else | 552 else |
553 -- We're not automatically doing SSL, so we're not secure (yet) | 553 -- We're not automatically doing SSL, so we're not secure (yet) |
554 ssl = false | 554 ssl = false |