Commit 969753a7 authored by Chris McDonough's avatar Chris McDonough

Do not configure a default set of servers if none are specified in the config file.

parent 6ec2ad15
...@@ -160,11 +160,7 @@ def root_handler(config): ...@@ -160,11 +160,7 @@ def root_handler(config):
# if no servers are defined, create default http server and ftp server # if no servers are defined, create default http server and ftp server
if not config.servers: if not config.servers:
import ZServer.datatypes config.servers = []
config.servers = [
ZServer.datatypes.HTTPServerFactory(_DummyServerConfig(8080)),
ZServer.datatypes.FTPServerFactory(_DummyServerConfig(8021)),
]
# prepare servers: # prepare servers:
for factory in config.servers: for factory in config.servers:
...@@ -179,18 +175,6 @@ def root_handler(config): ...@@ -179,18 +175,6 @@ def root_handler(config):
import ZPublisher.HTTPRequest import ZPublisher.HTTPRequest
ZPublisher.HTTPRequest.trusted_proxies = tuple(config.trusted_proxies) ZPublisher.HTTPRequest.trusted_proxies = tuple(config.trusted_proxies)
class _DummyServerConfig:
class _Thing:
pass
def __init__(self, port):
import socket
self.address = self._Thing()
self.address.family = socket.AF_INET
self.address.address = '', port
self.force_connection_close = 0
def handleConfig(config, multihandler): def handleConfig(config, multihandler):
handlers = {} handlers = {}
for name, value in globals().items(): for name, value in globals().items():
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment