aboutsummaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2010-07-15 08:27:56 +0100
committerMatthew Wild <mwild1@gmail.com>2010-07-15 08:27:56 +0100
commit948f1a6aedb694d02771180c963c2105ecee0fb2 (patch)
tree17168675d0663999c2f0e1e0fb07fc09bfd9b4ef /core
parentb3416f9848cb623ba1fd2b998ce438dc930850cd (diff)
parent1ec1d76bf9dd5cc4f738fccb1f83e29e970eed56 (diff)
downloadprosody-948f1a6aedb694d02771180c963c2105ecee0fb2.tar.gz
prosody-948f1a6aedb694d02771180c963c2105ecee0fb2.zip
Merge with backout
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 6f0a1f59..ff5506a3 100644
--- a/core/certmanager.lua
+++ b/core/certmanager.lua
@@ -19,7 +19,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");
local default_capath = "/etc/ssl/certs";
function create_context(host, mode, config)