aboutsummaryrefslogtreecommitdiffstats
path: root/core/certmanager.lua
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2014-04-20 23:39:45 +0200
committerKim Alvefur <zash@zash.se>2014-04-20 23:39:45 +0200
commit5c9b1e7c12e66e518237b17f26629b7da6198a4c (patch)
tree98ca74d989832843edfb586f3e4c72d65ebd6819 /core/certmanager.lua
parent84a60172446e16818f990a3066d38fc08acbc27c (diff)
parentaa3344731d2636073d39c3a2641d02813bd29019 (diff)
downloadprosody-5c9b1e7c12e66e518237b17f26629b7da6198a4c.tar.gz
prosody-5c9b1e7c12e66e518237b17f26629b7da6198a4c.zip
Merge 0.10->trunk
Diffstat (limited to 'core/certmanager.lua')
-rw-r--r--core/certmanager.lua4
1 files changed, 3 insertions, 1 deletions
diff --git a/core/certmanager.lua b/core/certmanager.lua
index 8f1e1520..ced17e58 100644
--- a/core/certmanager.lua
+++ b/core/certmanager.lua
@@ -111,7 +111,9 @@ function create_context(host, mode, user_ssl_config)
for option in pairs(set_options) do
local merged = {};
merge_set(core_defaults[option], merged);
- merge_set(global_ssl_config[option], merged);
+ if global_ssl_config then
+ merge_set(global_ssl_config[option], merged);
+ end
merge_set(user_ssl_config[option], merged);
local final_array = {};
for opt, enable in pairs(merged) do