# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1302097680 -3600
# Node ID 2494d299d8a25b45d5809951b0b17c33f59f60ac
# Parent  8973653feb35e23ea56bbb8363e3998a5b82c1dd# Parent  19c9bf88ec89dca97cef4057c21007079be2f631
Merge 0.8->trunk

diff -r 8973653feb35 -r 2494d299d8a2 plugins/mod_tls.lua
--- 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