From 9393c7df4c8c9d1ef43b197a7e514412e1a7f7ef Mon Sep 17 00:00:00 2001
From: Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
Date: Sat, 16 Apr 2016 20:56:47 +0100
Subject: mod_pubsub: Don?t require util.dataforms twice

---
 plugins/mod_pubsub/pubsub.lib.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/mod_pubsub/pubsub.lib.lua b/plugins/mod_pubsub/pubsub.lib.lua
index 1497c21c..805efc1f 100644
--- a/plugins/mod_pubsub/pubsub.lib.lua
+++ b/plugins/mod_pubsub/pubsub.lib.lua
@@ -31,7 +31,7 @@ local function pubsub_error_reply(stanza, error)
 end
 _M.pubsub_error_reply = pubsub_error_reply;
 
-local node_config_form = require"util.dataforms".new {
+local node_config_form = dataform {
 	{
 		type = "hidden";
 		name = "FORM_TYPE";
-- 
cgit v1.2.3


From bbf1653e0470250acbd67998045d2ca2a382281a Mon Sep 17 00:00:00 2001
From: Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
Date: Sat, 16 Apr 2016 21:08:05 +0100
Subject: Update every link to the documentation to use HTTPS

---
 HACKERS                                  |  4 ++--
 INSTALL                                  |  2 +-
 README                                   | 16 ++++++++--------
 certs/localhost.cnf                      |  2 +-
 net/connlisteners.lua                    |  2 +-
 net/httpserver.lua                       |  2 +-
 plugins/mod_admin_telnet.lua             |  2 +-
 plugins/mod_bosh.lua                     |  2 +-
 plugins/mod_component.lua                |  2 +-
 plugins/mod_http.lua                     |  2 +-
 plugins/mod_posix.lua                    |  2 +-
 plugins/mod_s2s/mod_s2s.lua              |  2 +-
 plugins/mod_storage_sql.lua              |  2 +-
 plugins/mod_storage_sql1.lua             |  6 +++---
 plugins/muc/mod_muc.lua                  |  2 +-
 prosody                                  |  2 +-
 prosody.cfg.lua.dist                     | 22 +++++++++++-----------
 prosodyctl                               | 22 +++++++++++-----------
 tools/migration/migrator/prosody_sql.lua |  2 +-
 util/async.lua                           |  4 ++--
 util/dependencies.lua                    | 12 ++++++------
 21 files changed, 57 insertions(+), 57 deletions(-)

diff --git a/HACKERS b/HACKERS
index 40cbd8aa..cae98091 100644
--- a/HACKERS
+++ b/HACKERS
@@ -2,11 +2,11 @@ Welcome hackers!
 
 This project accepts and *encourages* contributions. If you would like to get 
 involved you can join us on our mailing list and discussion rooms. More 
-information on these at http://prosody.im/discuss
+information on these at https://prosody.im/discuss
 
 Patches are welcome, though before sending we would appreciate if you read 
 docs/coding_style.txt for guidelines on how to format your code, and other tips.
 
-Documentation for developers can be found at http://prosody.im/doc/developers
+Documentation for developers can be found at https://prosody.im/doc/developers
 
 Have fun :)
diff --git a/INSTALL b/INSTALL
index f0fa894d..66e1df76 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,5 +1,5 @@
 (This file was created from
-http://prosody.im/doc/installing_from_source on 2013-03-31)
+https://prosody.im/doc/installing_from_source on 2013-03-31)
 
 ====== Installing from source ======
 ==== Dependencies ====
diff --git a/README b/README
index 3cffea49..797a2175 100644
--- a/README
+++ b/README
@@ -9,29 +9,29 @@ rapidly prototype new protocols.
 
 ## Useful links
 
-Homepage:        http://prosody.im/
-Download:        http://prosody.im/download
-Documentation:   http://prosody.im/doc/
+Homepage:        https://prosody.im/
+Download:        https://prosody.im/download
+Documentation:   https://prosody.im/doc/
 
 Jabber/XMPP Chat:
                Address:
                  prosody@conference.prosody.im
                Web interface:
-                 http://prosody.im/webchat
+                 https://prosody.im/webchat
                
 Mailing lists:
                User support and discussion:
-                 http://groups.google.com/group/prosody-users
+                 https://groups.google.com/group/prosody-users
                
                Development discussion:
-                 http://groups.google.com/group/prosody-dev
+                 https://groups.google.com/group/prosody-dev
                
                Issue tracker changes:
-                 http://groups.google.com/group/prosody-issues
+                 https://groups.google.com/group/prosody-issues
 
 ## Installation
 
 See the accompanying INSTALL file for help on building Prosody from source. Alternatively 
-see our guide at http://prosody.im/doc/install
+see our guide at https://prosody.im/doc/install
 
 
diff --git a/certs/localhost.cnf b/certs/localhost.cnf
index 41548534..80a954a9 100644
--- a/certs/localhost.cnf
+++ b/certs/localhost.cnf
@@ -13,7 +13,7 @@ otherName.2 = 1.3.6.1.5.5.7.8.5;FORMAT:UTF8,UTF8:localhost
 [distinguished_name]
 countryName = GB
 organizationName = Prosody IM
-organizationalUnitName = http://prosody.im/doc/certificates
+organizationalUnitName = https://prosody.im/doc/certificates
 commonName = Example certificate
 
 [req]
diff --git a/net/connlisteners.lua b/net/connlisteners.lua
index 000bfa63..38cf8f08 100644
--- a/net/connlisteners.lua
+++ b/net/connlisteners.lua
@@ -5,7 +5,7 @@ local traceback = debug.traceback;
 local _ENV = nil;
 
 local function fail()
-	log("error", "Attempt to use legacy connlisteners API. For more info see http://prosody.im/doc/developers/network");
+	log("error", "Attempt to use legacy connlisteners API. For more info see https://prosody.im/doc/developers/network");
 	log("error", "Legacy connlisteners API usage, %s", traceback("", 2));
 end
 
diff --git a/net/httpserver.lua b/net/httpserver.lua
index 6e2e31b9..56561306 100644
--- a/net/httpserver.lua
+++ b/net/httpserver.lua
@@ -5,7 +5,7 @@ local traceback = debug.traceback;
 local _ENV = nil;
 
 function fail()
-	log("error", "Attempt to use legacy HTTP API. For more info see http://prosody.im/doc/developers/legacy_http");
+	log("error", "Attempt to use legacy HTTP API. For more info see https://prosody.im/doc/developers/legacy_http");
 	log("error", "Legacy HTTP API usage, %s", traceback("", 2));
 end
 
diff --git a/plugins/mod_admin_telnet.lua b/plugins/mod_admin_telnet.lua
index 916b29a3..4f11d8ea 100644
--- a/plugins/mod_admin_telnet.lua
+++ b/plugins/mod_admin_telnet.lua
@@ -1188,7 +1188,7 @@ function printbanner(session)
 	if option == "short" or option == "full" then
 	session.print("Welcome to the Prosody administration console. For a list of commands, type: help");
 	session.print("You may find more help on using this console in our online documentation at ");
-	session.print("http://prosody.im/doc/console\n");
+	session.print("https://prosody.im/doc/console\n");
 	end
 	if option ~= "short" and option ~= "full" and option ~= "graphic" then
 		session.print(option);
diff --git a/plugins/mod_bosh.lua b/plugins/mod_bosh.lua
index a567c605..47f0b3b4 100644
--- a/plugins/mod_bosh.lua
+++ b/plugins/mod_bosh.lua
@@ -439,7 +439,7 @@ local GET_response = {
 	};
 	body = [[<html><body>
 	<p>It works! Now point your BOSH client to this URL to connect to Prosody.</p>
-	<p>For more information see <a href="http://prosody.im/doc/setting_up_bosh">Prosody: Setting up BOSH</a>.</p>
+	<p>For more information see <a href="https://prosody.im/doc/setting_up_bosh">Prosody: Setting up BOSH</a>.</p>
 	</body></html>]];
 };
 
diff --git a/plugins/mod_component.lua b/plugins/mod_component.lua
index eebaaf3e..340faec0 100644
--- a/plugins/mod_component.lua
+++ b/plugins/mod_component.lua
@@ -31,7 +31,7 @@ local sessions = module:shared("sessions");
 
 function module.add_host(module)
 	if module:get_host_type() ~= "component" then
-		error("Don't load mod_component manually, it should be for a component, please see http://prosody.im/doc/components", 0);
+		error("Don't load mod_component manually, it should be for a component, please see https://prosody.im/doc/components", 0);
 	end
 	
 	local env = module.environment;
diff --git a/plugins/mod_http.lua b/plugins/mod_http.lua
index c8ca5637..2178e2e8 100644
--- a/plugins/mod_http.lua
+++ b/plugins/mod_http.lua
@@ -120,7 +120,7 @@ function module.add_host(module)
 					module:log("warn", "App %s added handler twice for '%s', ignoring", app_name, event_name);
 				end
 			else
-				module:log("error", "Invalid route in %s, %q. See http://prosody.im/doc/developers/http#routes", app_name, key);
+				module:log("error", "Invalid route in %s, %q. See https://prosody.im/doc/developers/http#routes", app_name, key);
 			end
 		end
 		local services = portmanager.get_active_services();
diff --git a/plugins/mod_posix.lua b/plugins/mod_posix.lua
index 7e6d8799..7333fe47 100644
--- a/plugins/mod_posix.lua
+++ b/plugins/mod_posix.lua
@@ -59,7 +59,7 @@ if not prosody.start_time then -- server-starting
 	if not suid or suid == 0 or suid == "root" then
 		if pposix.getuid() == 0 and not module:get_option("run_as_root") then
 			module:log("error", "Danger, Will Robinson! Prosody doesn't need to be run as root, so don't do it!");
-			module:log("error", "For more information on running Prosody as root, see http://prosody.im/doc/root");
+			module:log("error", "For more information on running Prosody as root, see https://prosody.im/doc/root");
 			prosody.shutdown("Refusing to run as root");
 		end
 	end
diff --git a/plugins/mod_s2s/mod_s2s.lua b/plugins/mod_s2s/mod_s2s.lua
index 431e712c..c4a3fe23 100644
--- a/plugins/mod_s2s/mod_s2s.lua
+++ b/plugins/mod_s2s/mod_s2s.lua
@@ -146,7 +146,7 @@ module:hook("s2s-read-timeout", keepalive, -1);
 
 function module.add_host(module)
 	if module:get_option_boolean("disallow_s2s", false) then
-		module:log("warn", "The 'disallow_s2s' config option is deprecated, please see http://prosody.im/doc/s2s#disabling");
+		module:log("warn", "The 'disallow_s2s' config option is deprecated, please see https://prosody.im/doc/s2s#disabling");
 		return nil, "This host has disallow_s2s set";
 	end
 	module:hook("route/remote", route_to_existing_session, -1);
diff --git a/plugins/mod_storage_sql.lua b/plugins/mod_storage_sql.lua
index 4f46b3f6..60870a01 100644
--- a/plugins/mod_storage_sql.lua
+++ b/plugins/mod_storage_sql.lua
@@ -399,7 +399,7 @@ local function upgrade_table(params, apply_changes)
 		end);
 		if not success then
 			module:log("error", "Failed to check/upgrade database schema (%s), please see "
-				.."http://prosody.im/doc/mysql for help",
+				.."https://prosody.im/doc/mysql for help",
 				err or "unknown error");
 			return false;
 		end
diff --git a/plugins/mod_storage_sql1.lua b/plugins/mod_storage_sql1.lua
index a5bb5bfa..e1041bca 100644
--- a/plugins/mod_storage_sql1.lua
+++ b/plugins/mod_storage_sql1.lua
@@ -130,7 +130,7 @@ local function create_table()
 						module:log("info", "Database table automatically upgraded");
 					else
 						module:log("error", "Failed to upgrade database schema (%s), please see "
-							.."http://prosody.im/doc/mysql for help",
+							.."https://prosody.im/doc/mysql for help",
 							err or "unknown error");
 					end
 				end
@@ -139,7 +139,7 @@ local function create_table()
 		end
 	elseif params.driver ~= "SQLite3" then -- SQLite normally fails to prepare for existing table
 		module:log("warn", "Prosody was not able to automatically check/create the database table (%s), "
-			.."see http://prosody.im/doc/modules/mod_storage_sql#table_management for help.",
+			.."see https://prosody.im/doc/modules/mod_storage_sql#table_management for help.",
 			err or "unknown error");
 	end
 end
@@ -151,7 +151,7 @@ do -- process options to get a db connection
 	if not ok then
 		package.loaded["DBI"] = {};
 		module:log("error", "Failed to load the LuaDBI library for accessing SQL databases: %s", DBI);
-		module:log("error", "More information on installing LuaDBI can be found at http://prosody.im/doc/depends#luadbi");
+		module:log("error", "More information on installing LuaDBI can be found at https://prosody.im/doc/depends#luadbi");
 	end
 	prosody.lock_globals();
 	if not ok or not DBI.Connect then
diff --git a/plugins/muc/mod_muc.lua b/plugins/muc/mod_muc.lua
index 871b90b4..7ecd6490 100644
--- a/plugins/muc/mod_muc.lua
+++ b/plugins/muc/mod_muc.lua
@@ -7,7 +7,7 @@
 --
 
 if module:get_host_type() ~= "component" then
-	error("MUC should be loaded as a component, please see http://prosody.im/doc/components", 0);
+	error("MUC should be loaded as a component, please see https://prosody.im/doc/components", 0);
 end
 
 local muclib = module:require "muc";
diff --git a/prosody b/prosody
index 9cc32cee..ade85f80 100755
--- a/prosody
+++ b/prosody
@@ -111,7 +111,7 @@ function read_config()
 			print("A sample config file is included in the Prosody download called prosody.cfg.lua.dist");
 			print("Copy or rename it to prosody.cfg.lua and edit as necessary.");
 		end
-		print("More help on configuring Prosody can be found at http://prosody.im/doc/configure");
+		print("More help on configuring Prosody can be found at https://prosody.im/doc/configure");
 		print("Good luck!");
 		print("**************************");
 		print("");
diff --git a/prosody.cfg.lua.dist b/prosody.cfg.lua.dist
index d2af75a0..15725a35 100644
--- a/prosody.cfg.lua.dist
+++ b/prosody.cfg.lua.dist
@@ -1,7 +1,7 @@
 -- Prosody Example Configuration File
 --
 -- Information on configuring Prosody can be found on our
--- website at http://prosody.im/doc/configure
+-- website at https://prosody.im/doc/configure
 --
 -- Tip: You can check that the syntax of this file is correct
 -- when you have finished by running: prosodyctl check config
@@ -18,17 +18,17 @@
 
 -- This is a (by default, empty) list of accounts that are admins
 -- for the server. Note that you must create the accounts separately
--- (see http://prosody.im/doc/creating_accounts for info)
+-- (see https://prosody.im/doc/creating_accounts for info)
 -- Example: admins = { "user1@example.com", "user2@example.net" }
 admins = { }
 
 -- Enable use of libevent for better performance under high load
--- For more information see: http://prosody.im/doc/libevent
+-- For more information see: https://prosody.im/doc/libevent
 --use_libevent = true
 
 -- This is the list of modules Prosody will load on startup.
 -- It looks for mod_modulename.lua in the plugins folder, so make sure that exists too.
--- Documentation on modules can be found at: http://prosody.im/doc/modules
+-- Documentation on modules can be found at: https://prosody.im/doc/modules
 modules_enabled = {
 
 	-- Generally required
@@ -81,7 +81,7 @@ modules_disabled = {
 }
 
 -- Disable account creation by default, for security
--- For more information see http://prosody.im/doc/creating_accounts
+-- For more information see https://prosody.im/doc/creating_accounts
 allow_registration = false
 
 -- These are the SSL/TLS-related settings. If you don't want
@@ -100,7 +100,7 @@ c2s_require_encryption = true
 -- This provides ideal security, but requires servers you communicate
 -- with to support encryption AND present valid, trusted certificates.
 -- NOTE: Your version of LuaSec must support certificate verification!
--- For more information see http://prosody.im/doc/s2s#security
+-- For more information see https://prosody.im/doc/s2s#security
 
 s2s_secure_auth = false
 
@@ -119,7 +119,7 @@ s2s_secure_auth = false
 -- use Prosody's configured data storage to store the authentication data.
 -- To allow Prosody to offer secure authentication mechanisms to clients, the
 -- default provider stores passwords in plaintext. If you do not trust your
--- server please see http://prosody.im/doc/modules/mod_auth_internal_hashed
+-- server please see https://prosody.im/doc/modules/mod_auth_internal_hashed
 -- for information about using the hashed backend.
 
 authentication = "internal_plain"
@@ -127,7 +127,7 @@ authentication = "internal_plain"
 -- Select the storage backend to use. By default Prosody uses flat files
 -- in its configured data directory, but it also supports more backends
 -- through modules. An "sql" backend is included by default, but requires
--- additional dependencies. See http://prosody.im/doc/storage for more info.
+-- additional dependencies. See https://prosody.im/doc/storage for more info.
 
 --storage = "sql" -- Default is "internal"
 
@@ -137,7 +137,7 @@ authentication = "internal_plain"
 --sql = { driver = "PostgreSQL", database = "prosody", username = "prosody", password = "secret", host = "localhost" }
 
 -- Logging configuration
--- For advanced logging see http://prosody.im/doc/logging
+-- For advanced logging see https://prosody.im/doc/logging
 log = {
 	info = "prosody.log"; -- Change 'info' to 'debug' for verbose logging
 	error = "prosody.err";
@@ -166,7 +166,7 @@ VirtualHost "example.com"
 ------ Components ------
 -- You can specify components to add hosts that provide special services,
 -- like multi-user conferences, and transports.
--- For more information on components, see http://prosody.im/doc/components
+-- For more information on components, see https://prosody.im/doc/components
 
 ---Set up a MUC (multi-user chat) room server on conference.example.com:
 --Component "conference.example.com" "muc"
@@ -178,7 +178,7 @@ VirtualHost "example.com"
 --
 -- External components allow adding various services, such as gateways/
 -- transports to other networks like ICQ, MSN and Yahoo. For more info
--- see: http://prosody.im/doc/components#adding_an_external_component
+-- see: https://prosody.im/doc/components#adding_an_external_component
 --
 --Component "gateway.example.com"
 --	component_secret = "password"
diff --git a/prosodyctl b/prosodyctl
index 1fff7eed..e3bc6ffa 100755
--- a/prosodyctl
+++ b/prosodyctl
@@ -103,7 +103,7 @@ do
 			print("A sample config file is included in the Prosody download called prosody.cfg.lua.dist");
 			print("Copy or rename it to prosody.cfg.lua and edit as necessary.");
 		end
-		print("More help on configuring Prosody can be found at http://prosody.im/doc/configure");
+		print("More help on configuring Prosody can be found at https://prosody.im/doc/configure");
 		print("Good luck!");
 		print("**************************");
 		print("");
@@ -168,7 +168,7 @@ if ok and pposix then
 	pposix.setenv("PROSODY_CONFIG", ENV_CONFIG);
 else
 	print("Error: Unable to load pposix module. Check that Prosody is installed correctly.")
-	print("For more help send the below error to us through http://prosody.im/discuss");
+	print("For more help send the below error to us through https://prosody.im/discuss");
 	print(tostring(pposix))
 	os.exit(1);
 end
@@ -219,9 +219,9 @@ local error_messages = setmetatable({
 		["no-such-user"] = "The given user does not exist on the server";
 		["no-such-host"] = "The given hostname does not exist in the config";
 		["unable-to-save-data"] = "Unable to store, perhaps you don't have permission?";
-		["no-pidfile"] = "There is no 'pidfile' option in the configuration file, see http://prosody.im/doc/prosodyctl#pidfile for help";
-		["invalid-pidfile"] = "The 'pidfile' option in the configuration file is not a string, see http://prosody.im/doc/prosodyctl#pidfile for help";
-		["no-posix"] = "The mod_posix module is not enabled in the Prosody config file, see http://prosody.im/doc/prosodyctl for more info";
+		["no-pidfile"] = "There is no 'pidfile' option in the configuration file, see https://prosody.im/doc/prosodyctl#pidfile for help";
+		["invalid-pidfile"] = "The 'pidfile' option in the configuration file is not a string, see https://prosody.im/doc/prosodyctl#pidfile for help";
+		["no-posix"] = "The mod_posix module is not enabled in the Prosody config file, see https://prosody.im/doc/prosodyctl for more info";
 		["no-such-method"] = "This module has no commands";
 		["not-running"] = "Prosody is not running";
 		}, { __index = function (t,k) return "Error: "..(tostring(k):gsub("%-", " "):gsub("^.", string.upper)); end });
@@ -882,7 +882,7 @@ function commands.check(arg)
 			ok = false;
 			print("");
 			print("    No global options defined. Perhaps you have put a host definition at the top")
-			print("    of the config file? They should be at the bottom, see http://prosody.im/doc/configure#overview");
+			print("    of the config file? They should be at the bottom, see https://prosody.im/doc/configure#overview");
 		end
 		if it.count(enabled_hosts()) == 0 then
 			ok = false;
@@ -934,7 +934,7 @@ function commands.check(arg)
 				local n = it.count(misplaced_options);
 				print("    You have "..n.." option"..(n>1 and "s " or " ").."set under "..host.." that should be");
 				print("    in the global section of the config file, above any VirtualHost or Component definitions,")
-				print("    see http://prosody.im/doc/configure#overview for more information.")
+				print("    see https://prosody.im/doc/configure#overview for more information.")
 				print("");
 				print("    You need to move the following option"..(n>1 and "s" or "")..": "..table.concat(it.to_array(misplaced_options), ", "));
 			end
@@ -944,7 +944,7 @@ function commands.check(arg)
 			   	print("");
 			   	print("    Suggestion: If "..host.. " is a new host with no real users yet, consider renaming it now to");
 			   	print("     "..host:gsub("^[^.]+%.", "")..". You can use SRV records to redirect XMPP clients and servers to "..host..".");
-			   	print("     For more information see: http://prosody.im/doc/dns");
+			   	print("     For more information see: https://prosody.im/doc/dns");
 			end
 		end
 		local all_modules = set.new(config["*"].modules_enabled);
@@ -1182,7 +1182,7 @@ function commands.check(arg)
 				end
 				if host_ok_v6 and not v6_supported then
 					print("    Host "..host.." has AAAA records, but your version of LuaSocket does not support IPv6.");
-					print("      Please see http://prosody.im/doc/ipv6 for more information.");
+					print("      Please see https://prosody.im/doc/ipv6 for more information.");
 				end
 			end
 			if not all_targets_ok then
@@ -1196,7 +1196,7 @@ function commands.check(arg)
 		end
 		if not problem_hosts:empty() then
 			print("");
-			print("For more information about DNS configuration please see http://prosody.im/doc/dns");
+			print("For more information about DNS configuration please see https://prosody.im/doc/dns");
 			print("");
 			ok = false;
 		end
@@ -1275,7 +1275,7 @@ function commands.check(arg)
 			end
 			if cert_ok == false then
 				print("")
-				print("For more information about certificates please see http://prosody.im/doc/certificates");
+				print("For more information about certificates please see https://prosody.im/doc/certificates");
 				ok = false
 			end
 		end
diff --git a/tools/migration/migrator/prosody_sql.lua b/tools/migration/migrator/prosody_sql.lua
index 180ae910..1872a85d 100644
--- a/tools/migration/migrator/prosody_sql.lua
+++ b/tools/migration/migrator/prosody_sql.lua
@@ -12,7 +12,7 @@ local tostring = tostring;
 local tonumber = tonumber;
 
 if not have_DBI then
-	error("LuaDBI (required for SQL support) was not found, please see http://prosody.im/doc/depends#luadbi", 0);
+	error("LuaDBI (required for SQL support) was not found, please see https://prosody.im/doc/depends#luadbi", 0);
 end
 
 module "prosody_sql"
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
-- 
cgit v1.2.3