# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1461082982 -7200
# Node ID a700d54c620a45f221c4d0fde02ae966cfebd8cc
# Parent  addd041342bd00ecf034c1d2ba0a52c006ed6a0f# Parent  1909bde0e79f8993126035f4ed7b994618bb982e
Merge 0.9->0.10

diff -r addd041342bd -r a700d54c620a net/server_event.lua
--- a/net/server_event.lua	Tue Apr 19 17:44:04 2016 +0200
+++ b/net/server_event.lua	Tue Apr 19 18:23:02 2016 +0200
@@ -518,11 +518,10 @@
 				elseif interface.startsslcallback then  -- start ssl connection if needed
 					debug "starting ssl handshake after writing"
 					interface.eventstarthandshake = addevent( base, nil, EV_TIMEOUT, interface.startsslcallback, 0 )
+				elseif interface.writebuffer ~= 0 then
+					-- data possibly written from ondrain
+					return EV_WRITE, cfg.WRITE_TIMEOUT
 				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