diff options
| author | Matthew Wild <mwild1@gmail.com> | 2011-04-06 14:48:00 +0100 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2011-04-06 14:48:00 +0100 |
| commit | 3c24676c15c7426a49d8918482afc0fa1111452f (patch) | |
| tree | 3a7b4f0cea8b5c8004464c99f02a175546c843d3 | |
| parent | dc08b9834f4d9e00a204fe00b9e547924e0908e5 (diff) | |
| parent | 2d8a08de123cb93d21bd7015d90b8e5887e2ed54 (diff) | |
| download | prosody-3c24676c15c7426a49d8918482afc0fa1111452f.tar.gz prosody-3c24676c15c7426a49d8918482afc0fa1111452f.zip | |
Merge 0.8->trunk
| -rw-r--r-- | plugins/mod_tls.lua | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/plugins/mod_tls.lua b/plugins/mod_tls.lua index 52e3512d..cace2d69 100644 --- a/plugins/mod_tls.lua +++ b/plugins/mod_tls.lua @@ -91,10 +91,9 @@ module:hook_stanza(xmlns_starttls, "proceed", function (session, stanza) 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 |