Comparison

core/portmanager.lua @ 4624:3e4715d44561

portmanager: Support 'default_port' in service options
author Matthew Wild <mwild1@gmail.com>
date Thu, 15 Mar 2012 16:29:30 +0000
parent 4618:1ec8122ddffe
child 4677:05d8b4099cf5
comparison
equal deleted inserted replaced
4623:403b56b78018 4624:3e4715d44561
84 or listener.default_interface -- COMPAT w/pre0.9 84 or listener.default_interface -- COMPAT w/pre0.9
85 or default_interfaces); 85 or default_interfaces);
86 86
87 local bind_ports = set.new(config.get("*", config_prefix.."ports") 87 local bind_ports = set.new(config.get("*", config_prefix.."ports")
88 or service_info.default_ports 88 or service_info.default_ports
89 or {listener.default_port}); -- COMPAT w/pre-0.9 89 or {service_info.default_port
90 or listener.default_port -- COMPAT w/pre-0.9
91 });
90 92
91 local mode = listener.default_mode or "*a"; 93 local mode = listener.default_mode or "*a";
92 local ssl; 94 local ssl;
93 if service_info.encryption == "ssl" then 95 if service_info.encryption == "ssl" then
94 ssl = prosody.global_ssl_ctx; 96 ssl = prosody.global_ssl_ctx;