Mercurial > prosody-hg
diff core/portmanager.lua @ 6988:329d5fb8a9d3
Merge 0.10->trunk
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Thu, 10 Dec 2015 18:58:30 +0000 |
| parents | daaa52b3f45f |
| children | ec17115e3721 |
line wrap: on
line diff
--- a/core/portmanager.lua Tue Dec 08 23:15:42 2015 +0000 +++ b/core/portmanager.lua Thu Dec 10 18:58:30 2015 +0000 @@ -111,10 +111,10 @@ local global_ssl_config = config.get("*", "ssl") or {}; local prefix_ssl_config = config.get("*", config_prefix.."ssl") or global_ssl_config; ssl, err = certmanager.create_context(service_info.name.." port "..port, "server", - service_info.ssl_config or {}, prefix_ssl_config[interface], prefix_ssl_config[port], prefix_ssl_config, + service_info.ssl_config or {}, global_ssl_config[interface], global_ssl_config[port]); if not ssl then