aboutsummaryrefslogtreecommitdiffstats
path: root/net/server_event.lua
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2016-04-19 18:18:57 +0200
committerKim Alvefur <zash@zash.se>2016-04-19 18:18:57 +0200
commit57df704bb87cd5dcabde5e941b1e91631dc4ac2a (patch)
treea1f799286dc962072a3c4841728c49548cdb46d5 /net/server_event.lua
parent427dea0f3aab1fb05172629d60ac27412f7ddeb9 (diff)
downloadprosody-57df704bb87cd5dcabde5e941b1e91631dc4ac2a.tar.gz
prosody-57df704bb87cd5dcabde5e941b1e91631dc4ac2a.zip
net.server_event: Fix traceback if event re-added during starttls
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 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