net/server_epoll.lua
branch0.11
changeset 9826 13c2707d2417
parent 9825 7712488c8e49
child 9827 b61ba4496923
child 9935 485231f8b75d
--- 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);