diff options
author | Kim Alvefur <zash@zash.se> | 2016-04-17 22:28:48 +0200 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2016-04-17 22:28:48 +0200 |
commit | e36fe26d08200dd714b69c9f8b4c798d1e3a723e (patch) | |
tree | 65fa5a9caa2b6eb979d751ac6a7cfb369174e1d8 /util | |
parent | 0c5c1f5d0e105eea950e5fba1ea1a3a30f9ab1e9 (diff) | |
parent | bbf1653e0470250acbd67998045d2ca2a382281a (diff) | |
download | prosody-e36fe26d08200dd714b69c9f8b4c798d1e3a723e.tar.gz prosody-e36fe26d08200dd714b69c9f8b4c798d1e3a723e.zip |
Merge with Link Mauve
Diffstat (limited to 'util')
-rw-r--r-- | util/async.lua | 4 | ||||
-rw-r--r-- | util/dependencies.lua | 12 |
2 files changed, 8 insertions, 8 deletions
diff --git a/util/async.lua b/util/async.lua index 968ec804..7b2eae54 100644 --- a/util/async.lua +++ b/util/async.lua @@ -25,7 +25,7 @@ end local function waiter(num) local thread = coroutine.running(); if not thread then - error("Not running in an async context, see http://prosody.im/doc/developers/async"); + error("Not running in an async context, see https://prosody.im/doc/developers/async"); end num = num or 1; local waiting; @@ -48,7 +48,7 @@ local function guarder() return function (id, func) local thread = coroutine.running(); if not thread then - error("Not running in an async context, see http://prosody.im/doc/developers/async"); + error("Not running in an async context, see https://prosody.im/doc/developers/async"); end local guard = guards[id]; if not guard then diff --git a/util/dependencies.lua b/util/dependencies.lua index b3f07257..a644c395 100644 --- a/util/dependencies.lua +++ b/util/dependencies.lua @@ -28,7 +28,7 @@ local function missingdep(name, sources, msg) end print(""); print(msg or (name.." is required for Prosody to run, so we will now exit.")); - print("More help can be found on our website, at http://prosody.im/doc/depends"); + print("More help can be found on our website, at https://prosody.im/doc/depends"); print("**************************"); print(""); end @@ -40,7 +40,7 @@ end package.preload["util.ztact"] = function () if not package.loaded["core.loggingmanager"] then error("util.ztact has been removed from Prosody and you need to fix your config " - .."file. More information can be found at http://prosody.im/doc/packagers#ztact", 0); + .."file. More information can be found at https://prosody.im/doc/packagers#ztact", 0); else error("module 'util.ztact' has been deprecated in Prosody 0.8."); end @@ -93,7 +93,7 @@ local function check_dependencies() if not ssl then missingdep("LuaSec", { - ["Debian/Ubuntu"] = "http://prosody.im/download/start#debian_and_ubuntu"; + ["Debian/Ubuntu"] = "https://prosody.im/download/start#debian_and_ubuntu"; ["luarocks"] = "luarocks install luasec"; ["Source"] = "http://www.inf.puc-rio.br/~brunoos/luasec/"; }, "SSL/TLS support will not be available"); @@ -143,7 +143,7 @@ local function log_warnings() if ssl then local major, minor, veryminor, patched = ssl._VERSION:match("(%d+)%.(%d+)%.?(%d*)(M?)"); if not major or ((tonumber(major) == 0 and (tonumber(minor) or 0) <= 3 and (tonumber(veryminor) or 0) <= 2) and patched ~= "M") then - prosody.log("error", "This version of LuaSec contains a known bug that causes disconnects, see http://prosody.im/doc/depends"); + prosody.log("error", "This version of LuaSec contains a known bug that causes disconnects, see https://prosody.im/doc/depends"); end end local lxp = softreq"lxp"; @@ -152,7 +152,7 @@ local function log_warnings() prosody.log("error", "The version of LuaExpat on your system leaves Prosody " .."vulnerable to denial-of-service attacks. You should upgrade to " .."LuaExpat 1.3.0 or higher as soon as possible. See " - .."http://prosody.im/doc/depends#luaexpat for more information."); + .."https://prosody.im/doc/depends#luaexpat for more information."); end if not lxp.new({}).getcurrentbytecount then prosody.log("error", "The version of LuaExpat on your system does not support " @@ -160,7 +160,7 @@ local function log_warnings() .."networks (e.g. the internet) vulnerable to denial-of-service " .."attacks. You should upgrade to LuaExpat 1.3.0 or higher as " .."soon as possible. See " - .."http://prosody.im/doc/depends#luaexpat for more information."); + .."https://prosody.im/doc/depends#luaexpat for more information."); end end end |