# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1461083024 -7200
# Node ID 97fe648176ab164c3fcfc92b2000c382a5cf4531
# Parent  c381106173d04af27145fe743a2380db7ec2b9f8# Parent  a700d54c620a45f221c4d0fde02ae966cfebd8cc
Merge 0.10->trunk

diff -r c381106173d0 -r 97fe648176ab net/server_event.lua
--- a/net/server_event.lua	Tue Apr 19 18:00:04 2016 +0200
+++ b/net/server_event.lua	Tue Apr 19 18:23:44 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