Software / code / prosody
Changeset
8983:23f66f04e216
net.server: Set default read timeout to 14 minutes (fixes #971)
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Fri, 06 Jul 2018 19:02:19 +0200 |
| parents | 8982:4a576c39bb2f |
| children | 8984:fa80b3231a02 |
| files | net/server_epoll.lua net/server_event.lua net/server_select.lua |
| diffstat | 3 files changed, 3 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/net/server_epoll.lua Fri Jul 06 17:59:39 2018 +0200 +++ b/net/server_epoll.lua Fri Jul 06 19:02:19 2018 +0200 @@ -32,7 +32,7 @@ -- luacheck: std none local default_config = { __index = { - read_timeout = 900; + read_timeout = 14 * 60; write_timeout = 7; tcp_backlog = 128; accept_retry_interval = 10;
--- a/net/server_event.lua Fri Jul 06 17:59:39 2018 +0200 +++ b/net/server_event.lua Fri Jul 06 19:02:19 2018 +0200 @@ -26,7 +26,7 @@ MAX_SEND_LENGTH = 1024 * 1024 * 1024 * 1024, -- max bytes size of write buffer (for writing on sockets) ACCEPT_QUEUE = 128, -- might influence the length of the pending sockets queue ACCEPT_DELAY = 10, -- seconds to wait until the next attempt of a full server to accept - READ_TIMEOUT = 60 * 60 * 6, -- timeout in seconds for read data from socket + READ_TIMEOUT = 14 * 60, -- timeout in seconds for read data from socket WRITE_TIMEOUT = 180, -- timeout in seconds for write data on socket CONNECT_TIMEOUT = 20, -- timeout in seconds for connection attempts CLEAR_DELAY = 5, -- seconds to wait for clearing interface list (and calling ondisconnect listeners)
--- a/net/server_select.lua Fri Jul 06 17:59:39 2018 +0200 +++ b/net/server_select.lua Fri Jul 06 19:02:19 2018 +0200 @@ -146,7 +146,7 @@ _checkinterval = 30 -- interval in secs to check idle clients _sendtimeout = 60000 -- allowed send idle time in secs -_readtimeout = 6 * 60 * 60 -- allowed read idle time in secs +_readtimeout = 14 * 60 -- allowed read idle time in secs local is_windows = package.config:sub(1,1) == "\\" -- check the directory separator, to detemine whether this is Windows _maxfd = (is_windows and math.huge) or luasocket._SETSIZE or 1024 -- max fd number, limit to 1024 by default to prevent glibc buffer overflow, but not on Windows
