# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1449601958 -3600
# Node ID daaa52b3f45f777dbb54bb933139d1e4addf4703
# Parent  0ce2b400663b2e02c00863319693dbb79cbb8c29
portmanager: Lower the priority of module-supplied TLS options

diff -r 0ce2b400663b -r daaa52b3f45f core/portmanager.lua
--- a/core/portmanager.lua	Sun Dec 06 23:47:47 2015 +0100
+++ b/core/portmanager.lua	Tue Dec 08 20:12:38 2015 +0100
@@ -111,10 +111,10 @@
 					local global_ssl_config = config.get("*", "ssl") or {};
 					local prefix_ssl_config = config.get("*", config_prefix.."ssl") or global_ssl_config;
 					ssl, err = certmanager.create_context(service_info.name.." port "..port, "server",
-						service_info.ssl_config or {},
 						prefix_ssl_config[interface],
 						prefix_ssl_config[port],
 						prefix_ssl_config,
+						service_info.ssl_config or {},
 						global_ssl_config[interface],
 						global_ssl_config[port]);
 					if not ssl then