mirrors/prosody
1
0
Fork 0
mirror of https://github.com/bjc/prosody.git synced 2025-04-05 14:17:37 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

net.server_epoll: Rename handshake_timeout to ssl_handshake_timeout (fixes #1319)

Browse source 
This is to match server_event, see 430797a8fc81
This commit is contained in:
Kim Alvefur 2019-02-09 19:28:24 +01:00
parent 8732027944
commit 66d2e6adc3
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
net/server_epoll.lua
View file

@ -54,7 +54,7 @@ local default_config = { __index = {
read_size = 8192; read_size = 8192;
-- Timeout used during between steps in TLS handshakes -- 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) -- Maximum and minimum amount of time to sleep waiting for events (adjusted for pending timers)
max_wait = 86400; max_wait = 86400;
@ -516,11 +516,11 @@ function interface:tlshandskake()
elseif err == "wantread" then elseif err == "wantread" then
log("debug", "TLS handshake on %s to wait until readable", self); log("debug", "TLS handshake on %s to wait until readable", self);
self:set(true, false); self:set(true, false);
self:setreadtimeout(cfg.handshake_timeout); self:setreadtimeout(cfg.ssl_handshake_timeout);
elseif err == "wantwrite" then elseif err == "wantwrite" then
log("debug", "TLS handshake on %s to wait until writable", self); log("debug", "TLS handshake on %s to wait until writable", self);
self:set(false, true); self:set(false, true);
self:setwritetimeout(cfg.handshake_timeout); self:setwritetimeout(cfg.ssl_handshake_timeout);
else else
log("debug", "TLS handshake error on %s: %s", self, err); log("debug", "TLS handshake error on %s: %s", self, err);
self:on("disconnect", err); self:on("disconnect", err);