aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2018-11-30 19:43:12 +0100
committerKim Alvefur <zash@zash.se>2018-11-30 19:43:12 +0100
commitb9beadc7c8d795c629cbf2239f50be7dfc165a4c (patch)
tree2fe858f552ac60040e600c4dd99d8ca7b3c0bdb0
parentc69c7e8d8eb8cc9cb383ec7fa098369ab657b8a2 (diff)
parent6176e9ff1b48d42310eed5730aa82d8bc3968d22 (diff)
downloadprosody-b9beadc7c8d795c629cbf2239f50be7dfc165a4c.tar.gz
prosody-b9beadc7c8d795c629cbf2239f50be7dfc165a4c.zip
Merge 0.11->trunk
-rw-r--r--net/server_epoll.lua18
1 files changed, 16 insertions, 2 deletions
diff --git a/net/server_epoll.lua b/net/server_epoll.lua
index f7e5ae49..13c8315a 100644
--- a/net/server_epoll.lua
+++ b/net/server_epoll.lua
@@ -35,14 +35,28 @@ local _ENV = nil;
-- luacheck: std none
local default_config = { __index = {
+ -- If a connection is silent for this long, close it unless onreadtimeout says not to
read_timeout = 14 * 60;
- write_timeout = 7;
+
+ -- How long to wait for a socket to become writable after queuing data to send
+ write_timeout = 60;
+
+ -- Some number possibly influencing how many pending connections can be accepted
tcp_backlog = 128;
+
+ -- If accepting a new incoming connection fails, wait this long before trying again
accept_retry_interval = 10;
+
+ -- If there is still more data to read from LuaSocktes buffer, wait this long and read again
read_retry_delay = 1e-06;
+
+ -- Size of chunks to read from sockets
read_size = 8192;
- connect_timeout = 20;
+
+ -- Timeout used during between steps in TLS handshakes
handshake_timeout = 60;
+
+ -- Maximum and minimum amount of time to sleep waiting for events (adjusted for pending timers)
max_wait = 86400;
min_wait = 1e-06;
}};