Software / code / prosody
Diff
core/portmanager.lua @ 6980:daaa52b3f45f
portmanager: Lower the priority of module-supplied TLS options
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Tue, 08 Dec 2015 20:12:38 +0100 |
| parent | 6788:d64c1f3c7e2e |
| child | 7078:ec17115e3721 |
line wrap: on
line diff
--- a/core/portmanager.lua Sun Dec 06 23:47:47 2015 +0100 +++ b/core/portmanager.lua Tue Dec 08 20:12:38 2015 +0100 @@ -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
