From 66d2e6adc37e57f9063885d4937d4e95982bfd6c Mon Sep 17 00:00:00 2001
From: Kim Alvefur <zash@zash.se>
Date: Sat, 9 Feb 2019 19:28:24 +0100
Subject: net.server_epoll: Rename handshake_timeout to ssl_handshake_timeout
(fixes #1319)
This is to match server_event, see 430797a8fc81
---
net/server_epoll.lua | 6 +++---
1 file 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);
--
cgit v1.2.3