aboutsummaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2010-07-15 08:25:50 +0100
committerMatthew Wild <mwild1@gmail.com>2010-07-15 08:25:50 +0100
commit1ec1d76bf9dd5cc4f738fccb1f83e29e970eed56 (patch)
tree7d396676238e2dc010e947af0b9da048bcc95bee /core
parentcf0bd27f7cd47a3c4bd79d31f0952f36f8a7f37f (diff)
downloadprosody-1ec1d76bf9dd5cc4f738fccb1f83e29e970eed56.tar.gz
prosody-1ec1d76bf9dd5cc4f738fccb1f83e29e970eed56.zip
Backed out changeset 598c33a99a31 (already fixed a better way)
Diffstat (limited to 'core')
-rw-r--r--core/certmanager.lua2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/certmanager.lua b/core/certmanager.lua
index 6b31b21e..5de604f7 100644
--- a/core/certmanager.lua
+++ b/core/certmanager.lua
@@ -11,7 +11,7 @@ local resolve_path = prosody.resolve_relative_path;
module "certmanager"
-- Global SSL options if not overridden per-host
-local default_ssl_config = configmanager.get("*", "core", "ssl") or {};
+local default_ssl_config = configmanager.get("*", "core", "ssl");
function create_context(host, mode, config)
if not ssl then return nil; end