[Zope-Checkins] CVS: Zope/lib/python/Zope/Startup - handlers.py:1.14

[Chris McDonough]

Update of /cvs-repository/Zope/lib/python/Zope/Startup
In directory cvs.zope.org:/tmp/cvs-serv10730

Modified Files:
	handlers.py 
Log Message:
Do not configure a default set of servers if none are specified in the config file.


=== Zope/lib/python/Zope/Startup/handlers.py 1.13 => 1.14 ===
--- Zope/lib/python/Zope/Startup/handlers.py:1.13	Thu Oct 30 11:43:05 2003
+++ Zope/lib/python/Zope/Startup/handlers.py	Sun Dec 21 18:04:19 2003
@@ -160,11 +160,7 @@
 
     # if no servers are defined, create default http server and ftp server
     if not config.servers:
-        import ZServer.datatypes
-        config.servers = [
-            ZServer.datatypes.HTTPServerFactory(_DummyServerConfig(8080)),
-            ZServer.datatypes.FTPServerFactory(_DummyServerConfig(8021)),
-            ]
+        config.servers = []
 
     # prepare servers:
     for factory in config.servers:
@@ -178,18 +174,6 @@
     if config.trusted_proxies:
         import ZPublisher.HTTPRequest
         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):
     handlers = {}