aboutsummaryrefslogtreecommitdiffstats
path: root/net/server_event.lua
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2016-04-19 18:23:02 +0200
committerKim Alvefur <zash@zash.se>2016-04-19 18:23:02 +0200
commitbe79af9fbb47f35b0bccf0337e8035e5b070d390 (patch)
tree5a75386f70ffd46bb5a5355f83af4749ca8134fb /net/server_event.lua
parent7ec3aac1af0d965b32e71d760c02cc6a31a99655 (diff)
parent376dab8b5e1303db5400fda48a113b60c540d069 (diff)
downloadprosody-be79af9fbb47f35b0bccf0337e8035e5b070d390.tar.gz
prosody-be79af9fbb47f35b0bccf0337e8035e5b070d390.zip
Merge 0.9->0.10
Diffstat (limited to 'net/server_event.lua')
-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 a67d5afb..5fd49d0a 100644
--- a/net/server_event.lua
+++ b/net/server_event.lua
@@ -518,12 +518,11 @@ local function handleclient( client, ip, port, server, pattern, listener, sslctx
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, cfg.WRITE_TIMEOUT
end
interface.eventwrite = nil
return -1