Mercurial Mercurial > prosody > prosody / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
net.server_select: Restore dependency on LuaSec to soft for tests
authorKim Alvefur <zash@zash.se>
Wed, 27 Apr 2022 21:45:36 +0200
changeset 12491 db634db8e069
parent 12490 ee93df086926
child 12494 1c5cb4c49c50
net.server_select: Restore dependency on LuaSec to soft for tests server_select is used in e.g. storagemanager tests, and some of the CI runners are lacking LuaSec, which resulted in failures.
net/server_select.lua file | annotate | diff | comparison | revisions 
--- a/net/server_select.lua	Wed Apr 27 21:34:35 2022 +0200
+++ b/net/server_select.lua	Wed Apr 27 21:45:36 2022 +0200
@@ -47,17 +47,15 @@
 
 --// extern libs //--
 
-local has_luasec, luasec = pcall ( require , "ssl" )
 local luasocket = use "socket" or require "socket"
 local luasocket_gettime = luasocket.gettime
 local inet = require "util.net";
 local inet_pton = inet.pton;
 local sslconfig = require "util.sslconfig";
-local tls_impl = require "net.tls_luasec";
+local has_luasec, tls_impl = pcall(require, "net.tls_luasec");
 
 --// extern lib methods //--
 
-local ssl_wrap = ( has_luasec and luasec.wrap )
 local socket_bind = luasocket.bind
 local socket_select = luasocket.select
prosody