aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2019-02-07 14:02:15 +0100
committerKim Alvefur <zash@zash.se>2019-02-07 14:02:15 +0100
commit87320279443fc2d206b957837ccf4edd10c1b4bf (patch)
tree8a40ca837567c8d0494d1e7a5c8dd6b90987cbe3
parentda3f688d798fc25ed43085ba2fa1d54bb1978eb1 (diff)
downloadprosody-87320279443fc2d206b957837ccf4edd10c1b4bf.tar.gz
prosody-87320279443fc2d206b957837ccf4edd10c1b4bf.zip
net.server_epoll: Use send_timeout for write timout like other implementations (fixes #1316)
-rw-r--r--net/server_epoll.lua4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/server_epoll.lua b/net/server_epoll.lua
index ecb72a00..9c4fa581 100644
--- a/net/server_epoll.lua
+++ b/net/server_epoll.lua
@@ -39,7 +39,7 @@ local default_config = { __index = {
read_timeout = 14 * 60;
-- How long to wait for a socket to become writable after queuing data to send
- write_timeout = 60;
+ send_timeout = 60;
-- Some number possibly influencing how many pending connections can be accepted
tcp_backlog = 128;
@@ -266,7 +266,7 @@ function interface:setwritetimeout(t)
end
return
end
- t = t or cfg.write_timeout;
+ t = t or cfg.send_timeout;
if self._writetimeout then
self._writetimeout[1] = gettime() + t;
resort_timers = true;