Mercurial > prosody-hg
diff core/certmanager.lua @ 3372:395f692b3182
Merge with backout
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Thu, 15 Jul 2010 08:27:56 +0100 |
| parents | 7c87af1c9a68 5b32e6f84392 |
| children | 502a634f0578 |
line wrap: on
line diff
--- a/core/certmanager.lua Wed Jul 14 16:24:15 2010 +0100 +++ b/core/certmanager.lua Thu Jul 15 08:27:56 2010 +0100 @@ -19,7 +19,7 @@ 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)
