aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2017-08-29 15:24:53 +0200
committerKim Alvefur <zash@zash.se>2017-08-29 15:24:53 +0200
commitc22e367d7e44c8122b32343950b2ec6cd783ba22 (patch)
tree5e58431763b7e2f803b4605c220ff80fac8bc857
parent516230f98836464640e9f98cac0e6346ada521ec (diff)
parent153bcc9df5153e9515c19d9cc31b95cb5389447d (diff)
downloadprosody-im-server-c22e367d7e44c8122b32343950b2ec6cd783ba22.tar
prosody-im-server-c22e367d7e44c8122b32343950b2ec6cd783ba22.zip
Merge 0.10->trunk
-rwxr-xr-xprosody2
-rwxr-xr-xprosodyctl2
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);