Merge 0.10->trunk

author: Kim Alvefur <zash@zash.se>
date: Tue, 29 Aug 2017 15:24:53 +0200
parent: 8201:a0ad62a269df
parent: 8202:85a60e863509
child: 8253:3a6f5b0f56f0
--- a/prosodyctl	Mon Aug 28 21:05:12 2017 +0200
+++ b/prosodyctl	Tue Aug 29 15:24:53 2017 +0200
@@ -251,7 +251,7 @@
 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);