aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2018-07-06 19:02:19 +0200
committerKim Alvefur <zash@zash.se>2018-07-06 19:02:19 +0200
commit24ff76428fed35700c9e10c127920f201c6c6b13 (patch)
tree6a7f65b47fc2786f15e033ee74a8acdba58873b9
parenta2755285b03c17cabf34fc9eb6316bd6b0836633 (diff)
downloadprosody-24ff76428fed35700c9e10c127920f201c6c6b13.tar.gz
prosody-24ff76428fed35700c9e10c127920f201c6c6b13.zip
net.server: Set default read timeout to 14 minutes (fixes #971)
-rw-r--r--net/server_epoll.lua2
-rw-r--r--net/server_event.lua2
-rw-r--r--net/server_select.lua2
3 files changed, 3 insertions, 3 deletions
diff --git a/net/server_epoll.lua b/net/server_epoll.lua
index 0881f797..b94ebfa5 100644
--- a/net/server_epoll.lua
+++ b/net/server_epoll.lua
@@ -32,7 +32,7 @@ local _ENV = nil;
-- luacheck: std none
local default_config = { __index = {
- read_timeout = 900;
+ read_timeout = 14 * 60;
write_timeout = 7;
tcp_backlog = 128;
accept_retry_interval = 10;
diff --git a/net/server_event.lua b/net/server_event.lua
index 3e949092..6daf0944 100644
--- a/net/server_event.lua
+++ b/net/server_event.lua
@@ -26,7 +26,7 @@ local cfg = {
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)
diff --git a/net/server_select.lua b/net/server_select.lua
index 3b83bb6d..2cd095fe 100644
--- a/net/server_select.lua
+++ b/net/server_select.lua
@@ -146,7 +146,7 @@ _maxreadlen = 25000 * 1024 -- max len of read buffer
_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