diff options
| author | Kim Alvefur <zash@zash.se> | 2019-02-09 19:28:24 +0100 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2019-02-09 19:28:24 +0100 |
| commit | 92c74add1861b6098a727916c0e478dabb22733f (patch) | |
| tree | a6b01f1e1ed20d575276079b3e5c24a16c01a7e5 /net/server_epoll.lua | |
| parent | 63fdb2a14b38792589482622520a48dfdd0e914a (diff) | |
| download | prosody-92c74add1861b6098a727916c0e478dabb22733f.tar.gz prosody-92c74add1861b6098a727916c0e478dabb22733f.zip | |
net.server_epoll: Rename handshake_timeout to ssl_handshake_timeout (fixes #1319)
This is to match server_event, see 430797a8fc81
Diffstat (limited to 'net/server_epoll.lua')
| -rw-r--r-- | net/server_epoll.lua | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/server_epoll.lua b/net/server_epoll.lua index 9c4fa581..5c65d227 100644 --- a/net/server_epoll.lua +++ b/net/server_epoll.lua @@ -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; @@ -516,11 +516,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); |