Software / code / prosody
Diff
net/server_event.lua @ 7395:97fe648176ab
Merge 0.10->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Tue, 19 Apr 2016 18:23:44 +0200 |
| parent | 7386:5a9af30d5737 |
| parent | 7394:a700d54c620a |
| child | 7400:f1ff321178d4 |
line wrap: on
line diff
--- a/net/server_event.lua Tue Apr 19 18:00:04 2016 +0200 +++ b/net/server_event.lua Tue Apr 19 18:23:44 2016 +0200 @@ -518,11 +518,10 @@ elseif interface.startsslcallback then -- start ssl connection if needed debug "starting ssl handshake after writing" interface.eventstarthandshake = addevent( base, nil, EV_TIMEOUT, interface.startsslcallback, 0 ) + elseif interface.writebuffer ~= 0 then + -- data possibly written from ondrain + return EV_WRITE, cfg.WRITE_TIMEOUT elseif interface.eventreadtimeout then - return EV_WRITE, EV_TIMEOUT - end - if interface.writebuffer ~= 0 then - -- data possibly written from ondrain return EV_WRITE, cfg.WRITE_TIMEOUT end interface.eventwrite = nil
