Changeset

4617:d8e56e6ac8d4

portmanager: Remove check for service_info.multiplex (now implemented in mod_net_multiplex)
author Matthew Wild <mwild1@gmail.com>
date Thu, 15 Mar 2012 03:02:36 +0000
parents 4616:03d9fe1bcdd3
children 4618:1ec8122ddffe
files core/portmanager.lua
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/core/portmanager.lua	Thu Mar 15 03:02:09 2012 +0000
+++ b/core/portmanager.lua	Thu Mar 15 03:02:36 2012 +0000
@@ -99,7 +99,7 @@
 	
 	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);