From 49ba0ce08dd45d2438ddd1ee14d53da57cb9573e Mon Sep 17 00:00:00 2001 From: Kim Alvefur Date: Sat, 22 Nov 2014 11:51:54 +0100 Subject: 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) --- core/certmanager.lua | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'core/certmanager.lua') diff --git a/core/certmanager.lua b/core/certmanager.lua index 3454fcc4..7ad7b034 100644 --- a/core/certmanager.lua +++ b/core/certmanager.lua @@ -137,10 +137,8 @@ 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 or user_ssl_config; + return ctx, err, user_ssl_config; end function reload_ssl_config() -- cgit v1.2.3