Changeset

975:452ff29e296d

Merge
author Matthew Wild <mwild1@gmail.com>
date Fri, 10 Apr 2009 10:31:47 +0100
parents 974:82f7261c0482 (current diff) 972:144d0ad17389 (diff)
children 976:17af9851c81d
files
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/prosody	Fri Apr 10 10:31:38 2009 +0100
+++ b/prosody	Fri Apr 10 10:31:47 2009 +0100
@@ -115,7 +115,7 @@
 
 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 });