Mercurial > prosody-hg

comparison core/portmanager.lua @ 6988:329d5fb8a9d3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge 0.10->trunk
author Matthew Wild <mwild1@gmail.com>
date Thu, 10 Dec 2015 18:58:30 +0000
parents daaa52b3f45f
children ec17115e3721
comparison
equal deleted inserted replaced
6978:30c96a5db360 6988:329d5fb8a9d3
109 -- Create SSL context for this service/port 109 -- Create SSL context for this service/port
110 if service_info.encryption == "ssl" then 110 if service_info.encryption == "ssl" then
111 local global_ssl_config = config.get("*", "ssl") or {}; 111 local global_ssl_config = config.get("*", "ssl") or {};
112 local prefix_ssl_config = config.get("*", config_prefix.."ssl") or global_ssl_config; 112 local prefix_ssl_config = config.get("*", config_prefix.."ssl") or global_ssl_config;
113 ssl, err = certmanager.create_context(service_info.name.." port "..port, "server", 113 ssl, err = certmanager.create_context(service_info.name.." port "..port, "server",
114 service_info.ssl_config or {},
115 prefix_ssl_config[interface], 114 prefix_ssl_config[interface],
116 prefix_ssl_config[port], 115 prefix_ssl_config[port],
117 prefix_ssl_config, 116 prefix_ssl_config,
117 service_info.ssl_config or {},
118 global_ssl_config[interface], 118 global_ssl_config[interface],
119 global_ssl_config[port]); 119 global_ssl_config[port]);
120 if not ssl then 120 if not ssl then
121 log("error", "Error binding encrypted port for %s: %s", service_info.name, error_to_friendly_message(service_name, port_number, err) or "unknown error"); 121 log("error", "Error binding encrypted port for %s: %s", service_info.name, error_to_friendly_message(service_name, port_number, err) or "unknown error");
122 end 122 end