Software / code / prosody
Diff
core/certmanager.lua @ 6526:873538f0b18c
certmanager, mod_tls: Return final ssl config as third return value (fix for c6caaa440e74, portmanager assumes non-falsy second return value is an error) (thanks deoren)
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Sat, 22 Nov 2014 11:51:54 +0100 |
| parent | 6520:c6caaa440e74 |
| child | 6547:2f65de21ff56 |
line wrap: on
line diff
--- a/core/certmanager.lua Thu Nov 20 15:00:52 2014 +0100 +++ b/core/certmanager.lua Sat Nov 22 11:51:54 2014 +0100 @@ -137,10 +137,8 @@ else log("error", "SSL/TLS: Error initialising for %s: %s", host, err); end - else - err = nil; end - return ctx, err or user_ssl_config; + return ctx, err, user_ssl_config; end function reload_ssl_config()
