# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1543603392 -3600
# Node ID 2702168747401186007ef245379ac192fe6e2bbc
# Parent  27b62234792a509fd65d28005b27661209183688# Parent  4790d1b8891961d02e6c80496a52ca2ce3969f0b
Merge 0.11->trunk

diff -r 27b62234792a -r 270216874740 net/server_epoll.lua
--- a/net/server_epoll.lua	Fri Nov 30 16:03:09 2018 +0100
+++ b/net/server_epoll.lua	Fri Nov 30 19:43:12 2018 +0100
@@ -35,14 +35,28 @@
 -- 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;
 }};