aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--net/server_event.lua7
1 files changed, 3 insertions, 4 deletions
diff --git a/net/server_event.lua b/net/server_event.lua
index 1c6f1547..9da2e910 100644
--- a/net/server_event.lua
+++ b/net/server_event.lua
@@ -545,12 +545,11 @@ do
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.eventreadtimeout then
- return EV_WRITE, EV_TIMEOUT
- end
- if interface.writebuffer ~= 0 then
+ 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
interface.eventwrite = nil
return -1