Merge 0.10->trunk

1 files changed, 5 insertions, 1 deletions

diff --git a/prosody b/prosody
index 7f6b1c2d..cc879f12 100755
--- a/prosody
+++ b/prosody
@@ -321,7 +321,11 @@ function load_secondary_libraries()
 		return function() end
 	end});
 
-	require "net.http"
+	local http = require "net.http"
+	local config_ssl = config.get("*", "ssl")
+	local https_client = config.get("*", "client_https_ssl")
+	http.default.options.sslctx = require "core.certmanager".create_context("client_https port 0", "client",
+		{ capath = config_ssl.capath, cafile = config_ssl.cafile, verify = "peer", }, https_client);
 
 	require "util.array"
 	require "util.datetime"