aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2016-04-19 18:20:39 +0200
committerKim Alvefur <zash@zash.se>2016-04-19 18:20:39 +0200
commit2ba51125520664a26eec48325f1b3b041359bb24 (patch)
treea61e0d1820243e10f0e0497b2cc1c8c78c37f780
parent2f1bf340d3b39f941cc97fefbc6b1e4bc30ba8f9 (diff)
downloadprosody-2ba51125520664a26eec48325f1b3b041359bb24.tar.gz
prosody-2ba51125520664a26eec48325f1b3b041359bb24.zip
net.server_event: Return the correct value as timeout
-rw-r--r--net/server_event.lua2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/server_event.lua b/net/server_event.lua
index 9da2e910..59bd269a 100644
--- a/net/server_event.lua
+++ b/net/server_event.lua
@@ -549,7 +549,7 @@ do
-- data possibly written from ondrain
return EV_WRITE, cfg.WRITE_TIMEOUT
elseif interface.eventreadtimeout then
- return EV_WRITE, EV_TIMEOUT
+ return EV_WRITE, cfg.WRITE_TIMEOUT
end
interface.eventwrite = nil
return -1