diff options
| author | Kim Alvefur <zash@zash.se> | 2016-04-19 17:30:30 +0200 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2016-04-19 17:30:30 +0200 |
| commit | 3b521bff4ebef687881d8f5f989f3148eaf118d3 (patch) | |
| tree | 3edde11b7c7da47a785d5aeb95b6b3510baf56d2 /net | |
| parent | 75be55d7bd43bb415847f3e871bb81c8699a2967 (diff) | |
| parent | 0d34359c3e86b431aad543d4b5bc3f79df64a687 (diff) | |
| download | prosody-3b521bff4ebef687881d8f5f989f3148eaf118d3.tar.gz prosody-3b521bff4ebef687881d8f5f989f3148eaf118d3.zip | |
Merge 0.9->0.10
Diffstat (limited to 'net')
| -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 2edc9a0c..a67d5afb 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 |