diff options
| author | Kim Alvefur <zash@zash.se> | 2019-02-07 14:02:15 +0100 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2019-02-07 14:02:15 +0100 |
| commit | e54f89b40c73eb716e8b643270f7b912bf21bcc8 (patch) | |
| tree | 8a40ca837567c8d0494d1e7a5c8dd6b90987cbe3 /net | |
| parent | cb9e6a8ec7295a7bdf67a8cbefa1ec40f51f9a95 (diff) | |
| download | prosody-e54f89b40c73eb716e8b643270f7b912bf21bcc8.tar.gz prosody-e54f89b40c73eb716e8b643270f7b912bf21bcc8.zip | |
net.server_epoll: Use send_timeout for write timout like other implementations (fixes #1316)
Diffstat (limited to 'net')
| -rw-r--r-- | net/server_epoll.lua | 4 |
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; |