diff options
| author | Matthew Wild <mwild1@gmail.com> | 2015-12-10 18:58:30 +0000 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2015-12-10 18:58:30 +0000 |
| commit | 499d239662bfc5d663335626664adb0500efa5bc (patch) | |
| tree | 6abe7e628961f73a7f0a5b15d5715ded3345a77a /core/portmanager.lua | |
| parent | 60a27e378108dfaf2cfec678eaed357f79ced051 (diff) | |
| parent | 47fd3f55f22d92f1fa2d25097545a6b4a17d3564 (diff) | |
| download | prosody-499d239662bfc5d663335626664adb0500efa5bc.tar.gz prosody-499d239662bfc5d663335626664adb0500efa5bc.zip | |
Merge 0.10->trunk
Diffstat (limited to 'core/portmanager.lua')
| -rw-r--r-- | core/portmanager.lua | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/portmanager.lua b/core/portmanager.lua index 9f95077a..ad1a0be3 100644 --- a/core/portmanager.lua +++ b/core/portmanager.lua @@ -111,10 +111,10 @@ local function activate(service_name) 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 |