diff options
| author | Kim Alvefur <zash@zash.se> | 2016-04-19 17:32:22 +0200 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2016-04-19 17:32:22 +0200 |
| commit | 503138ad403a2606eaeb60ae2236c3ce90c8acea (patch) | |
| tree | 5b7865a9092e735c09169b654f9bbe1382ccb16a | |
| parent | 333708589f83a06ee69fd526be3b21843f948a57 (diff) | |
| parent | 3b521bff4ebef687881d8f5f989f3148eaf118d3 (diff) | |
| download | prosody-503138ad403a2606eaeb60ae2236c3ce90c8acea.tar.gz prosody-503138ad403a2606eaeb60ae2236c3ce90c8acea.zip | |
Merge 0.10->trunk
| -rw-r--r-- | net/server_event.lua | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/net/server_event.lua b/net/server_event.lua index ba35ccdf..025e3949 100644 --- a/net/server_event.lua +++ b/net/server_event.lua @@ -521,6 +521,10 @@ local function handleclient( client, ip, port, server, pattern, listener, sslctx 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 |