aboutsummaryrefslogtreecommitdiffstats
path: root/net/server_epoll.lua
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2019-02-09 19:36:35 +0100
committerKim Alvefur <zash@zash.se>2019-02-09 19:36:35 +0100
commit80f76cc9ee37cacd34b94627899b02fcb0e36b4b (patch)
tree9abe02aacb8b822d660b49a26812600f3f64df0f /net/server_epoll.lua
parent8fd3178bb049bf2fb8bc5ea50baece16296d0513 (diff)
parent66d2e6adc37e57f9063885d4937d4e95982bfd6c (diff)
downloadprosody-80f76cc9ee37cacd34b94627899b02fcb0e36b4b.tar.gz
prosody-80f76cc9ee37cacd34b94627899b02fcb0e36b4b.zip
Merge 0.11->trunk
Diffstat (limited to 'net/server_epoll.lua')
-rw-r--r--net/server_epoll.lua10
1 files changed, 5 insertions, 5 deletions
diff --git a/net/server_epoll.lua b/net/server_epoll.lua
index b2165b1d..807e0b4c 100644
--- a/net/server_epoll.lua
+++ b/net/server_epoll.lua
@@ -39,7 +39,7 @@ local default_config = { __index = {
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;
@@ -54,7 +54,7 @@ local default_config = { __index = {
read_size = 8192;
-- Timeout used during between steps in TLS handshakes
- handshake_timeout = 60;
+ ssl_handshake_timeout = 60;
-- Maximum and minimum amount of time to sleep waiting for events (adjusted for pending timers)
max_wait = 86400;
@@ -271,7 +271,7 @@ function interface:setwritetimeout(t)
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;
@@ -523,11 +523,11 @@ function interface:tlshandskake()
elseif err == "wantread" then
log("debug", "TLS handshake on %s to wait until readable", self);
self:set(true, false);
- self:setreadtimeout(cfg.handshake_timeout);
+ self:setreadtimeout(cfg.ssl_handshake_timeout);
elseif err == "wantwrite" then
log("debug", "TLS handshake on %s to wait until writable", self);
self:set(false, true);
- self:setwritetimeout(cfg.handshake_timeout);
+ self:setwritetimeout(cfg.ssl_handshake_timeout);
else
log("debug", "TLS handshake error on %s: %s", self, err);
self:on("disconnect", err);