Software / code / prosody
Changeset
9823:b61ba4496923
Merge 0.11->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Sat, 09 Feb 2019 19:36:35 +0100 |
| parents | 9820:87a1742f928d (current diff) 9822:13c2707d2417 (diff) |
| children | 9824:729de68f0068 |
| files | net/server_epoll.lua |
| diffstat | 1 files changed, 5 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/net/server_epoll.lua Mon Feb 04 09:28:02 2019 +0000 +++ b/net/server_epoll.lua Sat Feb 09 19:36:35 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; @@ -54,7 +54,7 @@ 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 @@ 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 @@ 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);
