diff options
| author | Kim Alvefur <zash@zash.se> | 2019-04-24 18:06:48 +0200 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2019-04-24 18:06:48 +0200 |
| commit | aac3fbdf9b1eaa0d09aaa1f5d78f9e5cc7c12c03 (patch) | |
| tree | 6428934ad658fb37297399185cbd51ea8adce98d /core | |
| parent | 196ac28ab5b002063f2b25dc60bd809c707b8ab2 (diff) | |
| parent | c42a786ec79fcfe936a3dccde9d0cdf70d6255b0 (diff) | |
| download | prosody-aac3fbdf9b1eaa0d09aaa1f5d78f9e5cc7c12c03.tar.gz prosody-aac3fbdf9b1eaa0d09aaa1f5d78f9e5cc7c12c03.zip | |
Merge 0.11->trunk
Diffstat (limited to 'core')
| -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 5aef07d7..9eb40abf 100644 --- a/core/portmanager.lua +++ b/core/portmanager.lua @@ -113,6 +113,7 @@ local function activate(service_name) if service_info.encryption == "ssl" then local global_ssl_config = config.get("*", "ssl") or {}; local prefix_ssl_config = config.get("*", config_prefix.."ssl") or global_ssl_config; + log("debug", "Creating context for direct TLS service %s on port %d", service_info.name, port); ssl, err, cfg = certmanager.create_context(service_info.name.." port "..port, "server", prefix_ssl_config[interface], prefix_ssl_config[port], @@ -254,7 +255,6 @@ local function add_sni_host(host, service) end end end - prosody.events.add_handler("item-added/net-provider", function (event) local item = event.item; register_service(item.name, item); |