Software / code / prosody
Changeset
9822:13c2707d2417 0.11
net.server_epoll: Rename handshake_timeout to ssl_handshake_timeout (fixes #1319)
This is to match server_event, see 430797a8fc81
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Sat, 09 Feb 2019 19:28:24 +0100 |
| parents | 9821:7712488c8e49 |
| children | 9823:b61ba4496923 9827:fd8aaab6669c |
| files | net/server_epoll.lua |
| diffstat | 1 files changed, 3 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/net/server_epoll.lua Thu Feb 07 14:02:15 2019 +0100 +++ b/net/server_epoll.lua Sat Feb 09 19:28:24 2019 +0100 @@ -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; @@ -516,11 +516,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);
