diff options
| author | Kim Alvefur <zash@zash.se> | 2015-10-11 20:03:00 +0200 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2015-10-11 20:03:00 +0200 |
| commit | 539d817c670d5eff6d52778f45200aab62afb84d (patch) | |
| tree | 38ce0d5d3bebeb2cc1e63965c9492ee0a8526dc9 /core | |
| parent | 03bee63e1f6cb987d43746970f83a6afb41de24e (diff) | |
| parent | 3c66dcabd1962de1b9e3d5f31d76f5569124cae2 (diff) | |
| download | prosody-539d817c670d5eff6d52778f45200aab62afb84d.tar.gz prosody-539d817c670d5eff6d52778f45200aab62afb84d.zip | |
Merge 0.10->trunk
Diffstat (limited to 'core')
| -rw-r--r-- | core/certmanager.lua | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/core/certmanager.lua b/core/certmanager.lua index 958ad3a3..05f0f809 100644 --- a/core/certmanager.lua +++ b/core/certmanager.lua @@ -101,6 +101,8 @@ local function create_context(host, mode, ...) for option in pairs(path_options) do if type(user_ssl_config[option]) == "string" then user_ssl_config[option] = resolve_path(config_path, user_ssl_config[option]); + else + user_ssl_config[option] = nil; end end |