# HG changeset patch # User Kim Alvefur # Date 1461079942 -7200 # Node ID 5a9af30d573798460b6978211a9931559d196f60 # Parent c8923f882274f930fc7c6d88120d948824170870# Parent 17929cdacec282696a0e8bad4476b8d0e0f1a4b5 Merge 0.10->trunk diff -r c8923f882274 -r 5a9af30d5737 net/server_event.lua --- a/net/server_event.lua Tue Apr 19 17:10:42 2016 +0200 +++ b/net/server_event.lua Tue Apr 19 17:32:22 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 diff -r c8923f882274 -r 5a9af30d5737 plugins/muc/muc.lib.lua