diff options
| author | Kim Alvefur <zash@zash.se> | 2013-02-03 15:52:27 +0100 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2013-02-03 15:52:27 +0100 |
| commit | 1929113b7830954ae60ad49934b3c16bf746a9ba (patch) | |
| tree | a1d3fc24abd3048cb23d45b860640a83baa8c261 /core/portmanager.lua | |
| parent | 0f2d3d7139c741b6bd8714048694ee16a9b11c91 (diff) | |
| parent | 5cfdac70c61ae6562f72868ef7b55129b166aa80 (diff) | |
| download | prosody-1929113b7830954ae60ad49934b3c16bf746a9ba.tar.gz prosody-1929113b7830954ae60ad49934b3c16bf746a9ba.zip | |
Merge 0.9->trunk
Diffstat (limited to 'core/portmanager.lua')
| -rw-r--r-- | core/portmanager.lua | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/core/portmanager.lua b/core/portmanager.lua index 7427a8eb..b02ba53b 100644 --- a/core/portmanager.lua +++ b/core/portmanager.lua @@ -89,11 +89,12 @@ function activate(service_name) or default_interfaces bind_interfaces = set.new(type(bind_interfaces)~="table" and {bind_interfaces} or bind_interfaces); - local bind_ports = set.new(config.get("*", config_prefix.."ports") + local bind_ports = config.get("*", config_prefix.."ports") or service_info.default_ports or {service_info.default_port or listener.default_port -- COMPAT w/pre-0.9 - }); + } + bind_ports = set.new(type(bind_ports) ~= "table" and { bind_ports } or bind_ports ); local mode, ssl = listener.default_mode or "*a"; |