Software / code / prosody
Diff
net/server_event.lua @ 7400:f1ff321178d4
Merge 0.10->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Tue, 19 Apr 2016 19:00:46 +0200 |
| parent | 7395:97fe648176ab |
| parent | 7399:066a4dfdac18 |
| child | 7422:41be97f8158f |
line wrap: on
line diff
--- a/net/server_event.lua Tue Apr 19 18:46:07 2016 +0200 +++ b/net/server_event.lua Tue Apr 19 19:00:46 2016 +0200 @@ -518,7 +518,7 @@ 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 + elseif interface.writebufferlen ~= 0 then -- data possibly written from ondrain return EV_WRITE, cfg.WRITE_TIMEOUT elseif interface.eventreadtimeout then
