prosody
0e81e3dab896
core/certmanager.lua

Find changesets by keywords by author, files, the commit message, revision number or hash, or revset expression.

Software / code / prosody

Diff

core/certmanager.lua @ 6905:0e81e3dab896

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Sun, 11 Oct 2015 20:03:00 +0200
parent 6903:5ff42d85d4d5
child 7122:89c51ee23122
line wrap: on
line diff
--- a/core/certmanager.lua	Fri Oct 02 12:17:41 2015 +0200
+++ b/core/certmanager.lua	Sun Oct 11 20:03:00 2015 +0200
@@ -101,6 +101,8 @@
 	for option in pairs(path_options) do
 		if type(user_ssl_config[option]) == "string" then
 			user_ssl_config[option] = resolve_path(config_path, user_ssl_config[option]);
+		else
+			user_ssl_config[option] = nil;
 		end
 	end