# HG changeset patch # User Kim Alvefur # Date 1443197253 -7200 # Node ID de32d195e932d5a5224ecf686e2a71e3180eb59a # Parent 153a2e49c4f7809281db1a032e8a43b4210da297# Parent abff7543b79c6d85d192bd734cc074c46aba306f Merge diff -r abff7543b79c -r de32d195e932 net/server_event.lua --- 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)