diff options
| author | Kim Alvefur <zash@zash.se> | 2022-04-27 21:45:36 +0200 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2022-04-27 21:45:36 +0200 |
| commit | 75a15e67f60fcce8df742e68fc5ca988313f47a5 (patch) | |
| tree | 7b8ccf15343bb99b55f4ed05a283dac12af84c4d | |
| parent | c90b2eca9da711e26a608720f2c7d80fce4e26b1 (diff) | |
| download | prosody-75a15e67f60fcce8df742e68fc5ca988313f47a5.tar.gz prosody-75a15e67f60fcce8df742e68fc5ca988313f47a5.zip | |
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.
| -rw-r--r-- | net/server_select.lua | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/net/server_select.lua b/net/server_select.lua index 80754e1a..80f5f590 100644 --- a/net/server_select.lua +++ b/net/server_select.lua @@ -47,17 +47,15 @@ local coroutine_yield = coroutine.yield --// 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 |