Software / code / prosody
Changeset
8203:a7863f4aae65
Merge 0.10->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Tue, 29 Aug 2017 15:24:53 +0200 |
| parents | 8201:a0ad62a269df (current diff) 8202:85a60e863509 (diff) |
| children | 8208:b69b40a828fd |
| files | prosody prosodyctl |
| diffstat | 2 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/prosody Mon Aug 28 21:05:12 2017 +0200 +++ b/prosody Tue Aug 29 15:24:53 2017 +0200 @@ -322,7 +322,7 @@ 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);
--- 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);
