Mercurial Mercurial > prosody > prosody / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
certmanager: Return final ssl config along with ssl context on success
authorKim Alvefur <zash@zash.se>
Wed, 19 Nov 2014 14:47:03 +0100
changeset 6523 c6caaa440e74
parent 6522 367db22cf7d2
child 6524 29c7586665f5
certmanager: Return final ssl config along with ssl context on success
core/certmanager.lua file | annotate | diff | comparison | revisions 
--- 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()
prosody