# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1416404823 -3600
# Node ID c6caaa440e74b850ac39ce240a559bfd47776139
# Parent  367db22cf7d2d477e67ed63e97ebcdf1cf9a8276
certmanager: Return final ssl config along with ssl context on success

diff -r 367db22cf7d2 -r c6caaa440e74 core/certmanager.lua
--- a/core/certmanager.lua	Wed Nov 19 14:45:20 2014 +0100
+++ b/core/certmanager.lua	Wed Nov 19 14:47:03 2014 +0100
@@ -137,8 +137,10 @@
 		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()