# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1239355907 -3600
# Node ID 452ff29e296d8a6fa54841330de25ecba086e086
# Parent  82f7261c0482eb90349d5e7a1d3bfe75e5a55356# Parent  144d0ad17389a1d065572cfd816115033b976cfe
Merge

diff -r 82f7261c0482 -r 452ff29e296d prosody
--- 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 });