Software / code / prosody
Diff
net/server_event.lua @ 7399:066a4dfdac18
Merge 0.9->0.10
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Tue, 19 Apr 2016 19:00:19 +0200 |
| parent | 7394:a700d54c620a |
| parent | 7398:206f9b0485ad |
| child | 7400:f1ff321178d4 |
| child | 7419:325c03f5481b |
line wrap: on
line diff
--- a/net/server_event.lua Tue Apr 19 18:23:02 2016 +0200 +++ b/net/server_event.lua Tue Apr 19 19:00:19 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
