diff options
| author | Kim Alvefur <zash@zash.se> | 2014-11-20 15:01:47 +0100 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2014-11-20 15:01:47 +0100 |
| commit | 1875a89b0269a92b965298f3ca9f234630e11721 (patch) | |
| tree | 1942217f4c99d9e88151d983acabdd514ac04386 /core | |
| parent | 1717f1f2e18c51a7c3091f4a98f35db0b1de6860 (diff) | |
| parent | 6d35997e95d6491c72dcfc4b1ecf782e7542fbe5 (diff) | |
| download | prosody-1875a89b0269a92b965298f3ca9f234630e11721.tar.gz prosody-1875a89b0269a92b965298f3ca9f234630e11721.zip | |
Merge 0.10->trunk
Diffstat (limited to 'core')
| -rw-r--r-- | core/certmanager.lua | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/core/certmanager.lua b/core/certmanager.lua index 837fe231..3454fcc4 100644 --- a/core/certmanager.lua +++ b/core/certmanager.lua @@ -137,8 +137,10 @@ function create_context(host, mode, ...) else log("error", "SSL/TLS: Error initialising for %s: %s", host, err); end + else + err = nil; end - return ctx, err; + return ctx, err or user_ssl_config; end function reload_ssl_config() |