Software / code / prosody
Changeset
4245:2494d299d8a2
Merge 0.8->trunk
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Wed, 06 Apr 2011 14:48:00 +0100 |
| parents | 4243:8973653feb35 (current diff) 4244:19c9bf88ec89 (diff) |
| children | 4246:d0767040236f |
| files | |
| diffstat | 1 files changed, 3 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/plugins/mod_tls.lua Tue Apr 05 14:38:08 2011 +0100 +++ b/plugins/mod_tls.lua Wed Apr 06 14:48:00 2011 +0100 @@ -91,10 +91,9 @@ end); function module.load() - local global_ssl_config = config.get("*", "core", "ssl"); - local ssl_config = config.get(module.host, "core", "ssl"); - local base_host = module.host:match("%.(.*)"); - if ssl_config == global_ssl_config and hosts[base_host] then + local ssl_config = config.rawget(module.host, "core", "ssl"); + if not ssl_config then + local base_host = module.host:match("%.(.*)"); ssl_config = config.get(base_host, "core", "ssl"); end host.ssl_ctx = create_context(host.host, "client", ssl_config); -- for outgoing connections
