Merge 0.10->trunk

2 files changed, 2 insertions, 2 deletions

diff --git a/prosody b/prosody
index cc879f12..1895cf54 100755
--- a/prosody
+++ b/prosody
@@ -322,7 +322,7 @@ function load_secondary_libraries()
 	end});
 
 	local http = require "net.http"
-	local config_ssl = config.get("*", "ssl")
+	local config_ssl = config.get("*", "ssl") or {}
 	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);
diff --git a/prosodyctl b/prosodyctl
index 53399407..79f0a46d 100755
--- a/prosodyctl
+++ b/prosodyctl
@@ -251,7 +251,7 @@ local prosodyctl = require "util.prosodyctl"
 local socket = require "socket"
 
 local http = require "net.http"
-local config_ssl = config.get("*", "ssl")
+local config_ssl = config.get("*", "ssl") or {}
 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);