mirrors/prosody
1
0
Fork 0
mirror of https://github.com/bjc/prosody.git synced 2025-04-05 06:07:37 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge 0.9->0.10

Browse source
This commit is contained in:
Kim Alvefur 2016-04-19 18:23:02 +02:00
commit be79af9fbb
1 changed files with 3 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
net/server_event.lua
View file

@ -518,12 +518,11 @@ local function handleclient( client, ip, port, server, pattern, listener, sslctx
elseif interface.startsslcallback then -- start ssl connection if needed elseif interface.startsslcallback then -- start ssl connection if needed
debug "starting ssl handshake after writing" debug "starting ssl handshake after writing"
interface.eventstarthandshake = addevent( base, nil, EV_TIMEOUT, interface.startsslcallback, 0 ) interface.eventstarthandshake = addevent( base, nil, EV_TIMEOUT, interface.startsslcallback, 0 )
elseif interface.eventreadtimeout then elseif interface.writebuffer ~= 0 then
return EV_WRITE, EV_TIMEOUT
end
if interface.writebuffer ~= 0 then
-- data possibly written from ondrain -- data possibly written from ondrain
return EV_WRITE, cfg.WRITE_TIMEOUT return EV_WRITE, cfg.WRITE_TIMEOUT
elseif interface.eventreadtimeout then
return EV_WRITE, cfg.WRITE_TIMEOUT
end end
interface.eventwrite = nil interface.eventwrite = nil
return -1 return -1