diff options
| author | Matthew Wild <mwild1@gmail.com> | 2012-03-15 03:02:36 +0000 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2012-03-15 03:02:36 +0000 |
| commit | f0b8af1484581188305a3d0abac0f8b6c15bfb53 (patch) | |
| tree | cfbb9cdc3ddcd5700a493d663ed6948283f79f18 /core | |
| parent | 373fb34e948918f0a74732337e6357a92a59e669 (diff) | |
| download | prosody-f0b8af1484581188305a3d0abac0f8b6c15bfb53.tar.gz prosody-f0b8af1484581188305a3d0abac0f8b6c15bfb53.zip | |
portmanager: Remove check for service_info.multiplex (now implemented in mod_net_multiplex)
Diffstat (limited to 'core')
| -rw-r--r-- | core/portmanager.lua | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/portmanager.lua b/core/portmanager.lua index a7c3c44e..b4ceaef9 100644 --- a/core/portmanager.lua +++ b/core/portmanager.lua @@ -99,7 +99,7 @@ function activate_service(service_name) for interface in bind_interfaces do for port in bind_ports do - if not service_info.multiplex and #active_services:search(nil, interface, port) > 0 then + if #active_services:search(nil, interface, port) > 0 then log("error", "Multiple services configured to listen on the same port ([%s]:%d): %s, %s", interface, port, active_services:search(nil, interface, port)[1][1].service.name or "<unnamed>", service_name or "<unnamed>"); else local handler, err = server.addserver(interface, port, listener, mode, ssl); |