mirrors/prosody
1
0
Fork 0
mirror of https://github.com/bjc/prosody.git synced 2025-04-03 21:27:38 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge 0.10->trunk

Browse source
This commit is contained in:
Kim Alvefur 2017-08-29 15:24:53 +02:00
commit 4e7a2d21e8
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
prosody
View file

@ -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);

2
prosodyctl
View file

@ -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);