Merge

1 files changed, 1 insertions, 1 deletions

diff --git a/prosody b/prosody
index 42e4eb50..0d735e70 100755
--- a/prosody
+++ b/prosody
@@ -115,7 +115,7 @@ end);
 
 eventmanager.fire_event("server-starting");
 
-local global_ssl_ctx = config.get("*", "core", "ssl");
+local global_ssl_ctx = ssl and config.get("*", "core", "ssl");
 if global_ssl_ctx then
 	local default_ssl_ctx = { mode = "server", protocol = "sslv23", capath = "/etc/ssl/certs", verify = "none"; };
 	setmetatable(global_ssl_ctx, { __index = default_ssl_ctx });