Software / code / prosody
Diff
net/server_event.lua @ 7385:17929cdacec2
Merge 0.9->0.10
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Tue, 19 Apr 2016 17:30:30 +0200 |
| parent | 7339:b5565715fce8 |
| parent | 7384:65abd9d7bf88 |
| child | 7386:5a9af30d5737 |
| child | 7394:a700d54c620a |
line wrap: on
line diff
--- a/net/server_event.lua Tue Apr 19 12:33:58 2016 +0200 +++ b/net/server_event.lua Tue Apr 19 17:30:30 2016 +0200 @@ -521,6 +521,10 @@ 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 return -1 elseif byte and (err == "timeout" or err == "wantwrite") then -- want write again
