Changeset

4624:3e4715d44561

portmanager: Support 'default_port' in service options
author Matthew Wild <mwild1@gmail.com>
date Thu, 15 Mar 2012 16:29:30 +0000
parents 4623:403b56b78018
children 4625:325965bafae1
files core/portmanager.lua
diffstat 1 files changed, 3 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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;