prosody
abff7543b79c%3Ade32d195e932
Software / code / prosody
Changeset
6867:de32d195e932
Merge
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Fri, 25 Sep 2015 18:07:33 +0200 |
| parents | 6860:153a2e49c4f7 (diff) 6866:abff7543b79c (current diff) |
| children | 6868:dcf9ceac9265 6870:d5b416070f70 |
| files | |
| diffstat | 1 files changed, 6 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/net/server_event.lua Fri Sep 25 16:51:42 2015 +0100 +++ b/net/server_event.lua Fri Sep 25 18:07:33 2015 +0200 @@ -157,8 +157,7 @@ return false end self.conn:settimeout( 0 ) -- set non blocking - local handshakecallback = coroutine_wrap( - function( event ) + local handshakecallback = coroutine_wrap(function( event ) local _, err local attempt = 0 local maxattempt = cfg.MAX_HANDSHAKE_ATTEMPTS @@ -392,11 +391,11 @@ self:_lock( true, true, true ) -- lock the interface, to not disturb the handshake self.eventstarthandshake = addevent( base, nil, EV_TIMEOUT, self.startsslcallback, 0 ) -- add event to start handshake else -- wait until writebuffer is empty - self:_lock( true, true, false ) - debug "ssl session delayed until writebuffer is empty..." -end -self.starttls = false; -return true + self:_lock( true, true, false ) + debug "ssl session delayed until writebuffer is empty..." + end + self.starttls = false; + return true end function interface_mt:setoption(option, value)
