# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1331828970 0
# Node ID 3e4715d445614361c4a23bf9cd106cd64d8f0bd5
# Parent  403b56b7801877995a9ac5fb03e5f2bf5e2896b3
portmanager: Support 'default_port' in service options

diff -r 403b56b78018 -r 3e4715d44561 core/portmanager.lua
--- a/core/portmanager.lua	Thu Mar 15 14:47:46 2012 +0100
+++ b/core/portmanager.lua	Thu Mar 15 16:29:30 2012 +0000
@@ -86,7 +86,9 @@
 	
 	local bind_ports = set.new(config.get("*", config_prefix.."ports")
 		or service_info.default_ports
-		or {listener.default_port}); -- COMPAT w/pre-0.9
+		or {service_info.default_port
+		    or listener.default_port -- COMPAT w/pre-0.9
+		   });
 
 	local mode = listener.default_mode or "*a";
 	local ssl;