aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2016-09-23 16:09:46 +0200
committerKim Alvefur <zash@zash.se>2016-09-23 16:09:46 +0200
commitaec590ec796f8cc608f837de695337f9310e3757 (patch)
tree023614dd803186c6d42c7d9bd22e8d62c5e23d6d
parente9341ec4139489a9490099e7d10fa411e8e01d1a (diff)
downloadprosody-aec590ec796f8cc608f837de695337f9310e3757.tar.gz
prosody-aec590ec796f8cc608f837de695337f9310e3757.zip
util.dependencies: Set global 'ssl' for compat with LuaSec 0.6 (fixes #749)
-rw-r--r--util/dependencies.lua3
1 files changed, 3 insertions, 0 deletions
diff --git a/util/dependencies.lua b/util/dependencies.lua
index 4d50cf63..9ea211dd 100644
--- a/util/dependencies.lua
+++ b/util/dependencies.lua
@@ -99,6 +99,9 @@ function check_dependencies()
["luarocks"] = "luarocks install luasec";
["Source"] = "http://www.inf.puc-rio.br/~brunoos/luasec/";
}, "SSL/TLS support will not be available");
+ elseif not _G.ssl then
+ _G.ssl = ssl;
+ _G.ssl.context = require "ssl.context";
end
local encodings, err = softreq "util.encodings"