prosody
7712488c8e49
net/server_epoll.lua

Find changesets by keywords by author, files, the commit message, revision number or hash, or revset expression.

Software / code / prosody

Diff

net/server_epoll.lua @ 9821:7712488c8e49 0.11

net.server_epoll: Use send_timeout for write timout like other implementations (fixes #1316)
author Kim Alvefur <zash@zash.se>
date Thu, 07 Feb 2019 14:02:15 +0100
parent 9665:4790d1b88919
child 9822:13c2707d2417
line wrap: on
line diff
--- a/net/server_epoll.lua	Mon Feb 04 09:27:43 2019 +0000
+++ b/net/server_epoll.lua	Thu Feb 07 14:02:15 2019 +0100
@@ -39,7 +39,7 @@
 	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 @@
 		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;