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 | 277ee1b09d77a1e1dde4e6983e36d0c240956528 (patch) | |
| tree | 5b7865a9092e735c09169b654f9bbe1382ccb16a | |
| parent | fff25bc9b5828f3b5dd8fca6e5cd05b04feb2cf9 (diff) | |
| parent | ee3e8bbd38974e1c5c788b06e9002af7eb02fed3 (diff) | |
| download | prosody-277ee1b09d77a1e1dde4e6983e36d0c240956528.tar.gz prosody-277ee1b09d77a1e1dde4e6983e36d0c240956528.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 |