New ZServer architecture. Major updates all over the place. We're getting close to beta

quality.

ZServer/CHANGES.txt

-ZServer Changes
-
-  This file gives information on changes made to ZServer over time,
-  things that need to be done before the next release and future
-  plans.
-
-  Releases
-
-    ZServer 1.0a2
-
-      New Features
-
-        Preliminary support for PCGI has been added. It is still not
-        complete and bug free. The main problem is that all newlines
-        seem to get converted to carriage return newline pairs...
-        
-        Simple controls to limit FTP connections have been added to
-        help prevent denial of service attacks.
-        
-        FTP now supports login with a username and directory, i.e.
-        'joe@Projects/JoesProject' which authenticates the login in
-        the specified directory. You can still use a normal username
-        and defer authentication until you cd to a directory where you
-        are defined.
-
-      Bug Fixed
-
-        Data was being dropped from POST requests because of a bug in
-        the sized input collection of asynchat.
-
-        HTTP Response headers were not being correctly set.
-
-        URL prefixes for the the Zope HTTP handler could not be set to
-        ''. Now the empty prefix is the default, to simplify URLs.
-
-    ZServer 1.0a1
-
-      New Features
-
-        Initial release. Includes new threaded architecture--currently
-        limited to a thread pool of 1. Includes preliminary FTP
-        support. Includes HTTP support.
-
-      Bugs Fixed
- 
-        None
- 
+ZServer Changes
+
+  This file gives information on changes made to ZServer over time,
+  things that need to be done before the next release and future
+  plans.
+
+  Releases
+
+    ZServer 1.0b1
+    
+      New Features
+      
+        Major code reorganization. Major architecture changes. Future
+        producers are gone. Use of special request and response objects
+        to do most of the heavy lifting. 
+
+        ZServer can now handle multiple HTTP requests per connection.
+
+        Now using (almost) unmodified Medusa sources.
+        
+        Added environment variable overriding to HTTPServer.py
+      
+      Bugs Fixed
+      
+        Using PCGI under IIS, now PATH_INFO begins with a /
+        
+        Fixed FTP passive mode response message IP address.
+
+      Known Bugs
+      
+        PCGI under IIS 4.0 is broken with respect to file uploads, and binary
+        data in general. IIS seems to convert \n to \r\n in binary data :-(
+
+        The latest medusa select_trigger.py doesn't seem to work under NT.
+
+      TODO
+      
+        stress test multi-threaded channel push. (done)
+        
+        test http 1.1 pipelined requests. (done)
+
+        iron out additional http 1.1 issues... (hmm)
+        
+        test ftp with emacs. (done)
+
+        remove cruft.
+        
+        fix medusa select_trigger under win32.
+
+        re-write Zope installers to install a ZServer start script.
+
+        get pcgi working with IIS and apache under win32, or at least get
+        it working under apache 1.3.6 on NT
+
+    ZServer 1.0a2
+
+      New Features
+
+        Preliminary support for PCGI has been added. It is still not
+        complete and bug free. The main problem is that all newlines
+        seem to get converted to carriage return newline pairs...
+        
+        Simple controls to limit FTP connections have been added to
+        help prevent denial of service attacks.
+        
+        FTP now supports login with a username and directory, i.e.
+        'joe@Projects/JoesProject' which authenticates the login in
+        the specified directory. You can still use a normal username
+        and defer authentication until you cd to a directory where you
+        are defined.
+
+      Bugs Fixed
+
+        Data was being dropped from POST requests because of a bug in
+        the sized input collection of asynchat.
+
+        HTTP Response headers were not being correctly set.
+
+        URL prefixes for the the Zope HTTP handler could not be set to
+        ''. Now the empty prefix is the default, to simplify URLs.
+
+    ZServer 1.0a1
+
+      New Features
+
+        Initial release. Includes new threaded architecture--currently
+        limited to a thread pool of 1. Includes preliminary FTP
+        support. Includes HTTP support.
+
+      Bugs Fixed
+ 
+        None
+ 

ZServer/FTPRequest.py

+##############################################################################
+# 
+# Zope Public License (ZPL) Version 1.0
+# -------------------------------------
+# 
+# Copyright (c) Digital Creations.  All rights reserved.
+# 
+# This license has been certified as Open Source(tm).
+# 
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+# 
+# 1. Redistributions in source code must retain the above copyright
+#    notice, this list of conditions, and the following disclaimer.
+# 
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions, and the following disclaimer in
+#    the documentation and/or other materials provided with the
+#    distribution.
+# 
+# 3. Digital Creations requests that attribution be given to Zope
+#    in any manner possible. Zope includes a "Powered by Zope"
+#    button that is installed by default. While it is not a license
+#    violation to remove this button, it is requested that the
+#    attribution remain. A significant investment has been put
+#    into Zope, and this effort will continue if the Zope community
+#    continues to grow. This is one way to assure that growth.
+# 
+# 4. All advertising materials and documentation mentioning
+#    features derived from or use of this software must display
+#    the following acknowledgement:
+# 
+#      "This product includes software developed by Digital Creations
+#      for use in the Z Object Publishing Environment
+#      (http://www.zope.org/)."
+# 
+#    In the event that the product being advertised includes an
+#    intact Zope distribution (with copyright and license included)
+#    then this clause is waived.
+# 
+# 5. Names associated with Zope or Digital Creations must not be used to
+#    endorse or promote products derived from this software without
+#    prior written permission from Digital Creations.
+# 
+# 6. Modified redistributions of any form whatsoever must retain
+#    the following acknowledgment:
+# 
+#      "This product includes software developed by Digital Creations
+#      for use in the Z Object Publishing Environment
+#      (http://www.zope.org/)."
+# 
+#    Intact (re-)distributions of any official Zope release do not
+#    require an external acknowledgement.
+# 
+# 7. Modifications are encouraged but must be packaged separately as
+#    patches to official Zope releases.  Distributions that do not
+#    clearly separate the patches from the original work must be clearly
+#    labeled as unofficial distributions.  Modifications which do not
+#    carry the name Zope may be packaged in any form, as long as they
+#    conform to all of the clauses above.
+# 
+# 
+# Disclaimer
+# 
+#   THIS SOFTWARE IS PROVIDED BY DIGITAL CREATIONS ``AS IS'' AND ANY
+#   EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+#   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+#   PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL DIGITAL CREATIONS OR ITS
+#   CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+#   LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+#   USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+#   ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+#   OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+#   OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+#   SUCH DAMAGE.
+# 
+# 
+# This software consists of contributions made by Digital Creations and
+# many individuals on behalf of Digital Creations.  Specific
+# attributions are listed in the accompanying credits file.
+# 
+##############################################################################
+"""
+FTP Request class for FTP server.
+
+The FTP Request does the dirty work of turning an FTP request into something
+that ZPublisher can understand.
+"""
+
+from ZPublisher.HTTPRequest import HTTPRequest
+
+from cStringIO import StringIO
+import os
+from regsub import gsub
+from base64 import encodestring
+import string
+
+class FTPRequest(HTTPRequest):
+
+    def __init__(self, path, command, channel, response, stdin=None):
+        if stdin is None:
+            stdin=StringIO()
+        env=self._get_env(path, command, channel, stdin)
+        HTTPRequest.__init__(self, stdin, env, response, clean=1)
+
+    def _get_env(self, path, command, channel, stdin):
+        "Returns a CGI style environment"
+        env={}
+        env['SCRIPT_NAME']='/%s' % channel.module
+        env['REQUEST_METHOD']='GET' # XXX what should this be?
+        env['SERVER_SOFTWARE']=channel.server.SERVER_IDENT
+        if channel.userid != 'anonymous':
+            env['HTTP_AUTHORIZATION']='Basic %s' % gsub('\012','',
+                    encodestring('%s:%s' % (channel.userid, channel.password)))
+        env['SERVER_NAME']=channel.server.hostname
+        env['SERVER_PORT']=str(channel.server.port)
+        env['REMOTE_ADDR']=channel.client_addr[0]
+        env['GATEWAY_INTERFACE']='CGI/1.1' # that's stretching it ;-)
+        
+        # FTP commands
+        #
+        if type(command)==type(()):
+            args=command[1:]
+            command=command[0]
+        if command in ('LST','CWD','PASS'):
+            env['PATH_INFO']=self._join_paths(channel.path, path, 'manage_FTPlist')
+        elif command in ('MDTM','SIZE'):
+            env['PATH_INFO']=self._join_paths(channel.path, path, 'manage_FTPstat')
+        elif command=='RETR':
+            env['PATH_INFO']=self._join_paths(channel.path, path, 'manage_FTPget')
+        elif command in ('RMD','DELE'):
+            env['PATH_INFO']=self._join_paths(channel.path, path, 'manage_delObjects')
+            env['QUERY_STRING']='ids=%s' % args[0]
+        elif command=='MKD':
+            env['PATH_INFO']=self._join_paths(channel.path, path, 'manage_addFolder')
+            env['QUERY_STRING']='id=%s' % args[0]
+        elif command=='STOR':
+            env['PATH_INFO']=self._join_paths(channel.path, path)
+            env['REQUEST_METHOD']='PUT'
+            env['CONTENT_LENGTH']=len(stdin.getvalue())
+        else:
+            env['PATH_INFO']=self._join_paths(channel.path, path, command)
+        return env
+    
+    def _join_paths(self,*args):
+        path=apply(os.path.join,args)
+        path=os.path.normpath(path)
+        if os.sep != '/':
+            path=string.replace(path,os.sep,'/')
+        return path
+        
\ No newline at end of file

ZServer/FTPResponse.py

+##############################################################################
+# 
+# Zope Public License (ZPL) Version 1.0
+# -------------------------------------
+# 
+# Copyright (c) Digital Creations.  All rights reserved.
+# 
+# This license has been certified as Open Source(tm).
+# 
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+# 
+# 1. Redistributions in source code must retain the above copyright
+#    notice, this list of conditions, and the following disclaimer.
+# 
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions, and the following disclaimer in
+#    the documentation and/or other materials provided with the
+#    distribution.
+# 
+# 3. Digital Creations requests that attribution be given to Zope
+#    in any manner possible. Zope includes a "Powered by Zope"
+#    button that is installed by default. While it is not a license
+#    violation to remove this button, it is requested that the
+#    attribution remain. A significant investment has been put
+#    into Zope, and this effort will continue if the Zope community
+#    continues to grow. This is one way to assure that growth.
+# 
+# 4. All advertising materials and documentation mentioning
+#    features derived from or use of this software must display
+#    the following acknowledgement:
+# 
+#      "This product includes software developed by Digital Creations
+#      for use in the Z Object Publishing Environment
+#      (http://www.zope.org/)."
+# 
+#    In the event that the product being advertised includes an
+#    intact Zope distribution (with copyright and license included)
+#    then this clause is waived.
+# 
+# 5. Names associated with Zope or Digital Creations must not be used to
+#    endorse or promote products derived from this software without
+#    prior written permission from Digital Creations.
+# 
+# 6. Modified redistributions of any form whatsoever must retain
+#    the following acknowledgment:
+# 
+#      "This product includes software developed by Digital Creations
+#      for use in the Z Object Publishing Environment
+#      (http://www.zope.org/)."
+# 
+#    Intact (re-)distributions of any official Zope release do not
+#    require an external acknowledgement.
+# 
+# 7. Modifications are encouraged but must be packaged separately as
+#    patches to official Zope releases.  Distributions that do not
+#    clearly separate the patches from the original work must be clearly
+#    labeled as unofficial distributions.  Modifications which do not
+#    carry the name Zope may be packaged in any form, as long as they
+#    conform to all of the clauses above.
+# 
+# 
+# Disclaimer
+# 
+#   THIS SOFTWARE IS PROVIDED BY DIGITAL CREATIONS ``AS IS'' AND ANY
+#   EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+#   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+#   PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL DIGITAL CREATIONS OR ITS
+#   CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+#   LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+#   USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+#   ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+#   OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+#   OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+#   SUCH DAMAGE.
+# 
+# 
+# This software consists of contributions made by Digital Creations and
+# many individuals on behalf of Digital Creations.  Specific
+# attributions are listed in the accompanying credits file.
+# 
+##############################################################################
+"""
+Response class for the FTP Server.
+"""
+
+from ZPublisher.HTTPResponse import HTTPResponse
+from PubCore.ZEvent import Wakeup
+from cStringIO import StringIO
+import marshal
+
+
+class FTPResponse(HTTPResponse):
+    """
+    Response to an FTP command
+    """
+
+    def _finish(self):
+        self.stdout.finish(self)
+
+    def _marshalledBody(self):
+        return marshal.loads(self.body)
+
+ 
+class CallbackPipe:
+    """
+    Sends response object to a callback. Doesn't write anything.
+    The callback takes place in Medusa's thread, not the request thread.
+    """
+    def __init__(self, callback, args):
+        self._callback=callback
+        self._args=args
+        
+    def write(self, text):
+        pass
+        
+    def close(self):
+        pass
+        
+    def finish(self, response):
+        self._response=response
+        Wakeup(self.apply) # move callback to medusas thread
+        
+    def apply(self):
+        result=apply(self._callback, self._args+(self._response,))
+       
+        # is this necessary to break cycles?
+        self._callback=None
+        self._response=None
+        self._args=None
+        
+        return result    
+
+def make_response(callback,*args):
+    # XXX should this be the FTPResponse constructor instead?
+	return FTPResponse(stdout=CallbackPipe(callback, args), stderr=StringIO())
+    
\ No newline at end of file

ZServer/Producers.py

+##############################################################################
+# 
+# Zope Public License (ZPL) Version 1.0
+# -------------------------------------
+# 
+# Copyright (c) Digital Creations.  All rights reserved.
+# 
+# This license has been certified as Open Source(tm).
+# 
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+# 
+# 1. Redistributions in source code must retain the above copyright
+#    notice, this list of conditions, and the following disclaimer.
+# 
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions, and the following disclaimer in
+#    the documentation and/or other materials provided with the
+#    distribution.
+# 
+# 3. Digital Creations requests that attribution be given to Zope
+#    in any manner possible. Zope includes a "Powered by Zope"
+#    button that is installed by default. While it is not a license
+#    violation to remove this button, it is requested that the
+#    attribution remain. A significant investment has been put
+#    into Zope, and this effort will continue if the Zope community
+#    continues to grow. This is one way to assure that growth.
+# 
+# 4. All advertising materials and documentation mentioning
+#    features derived from or use of this software must display
+#    the following acknowledgement:
+# 
+#      "This product includes software developed by Digital Creations
+#      for use in the Z Object Publishing Environment
+#      (http://www.zope.org/)."
+# 
+#    In the event that the product being advertised includes an
+#    intact Zope distribution (with copyright and license included)
+#    then this clause is waived.
+# 
+# 5. Names associated with Zope or Digital Creations must not be used to
+#    endorse or promote products derived from this software without
+#    prior written permission from Digital Creations.
+# 
+# 6. Modified redistributions of any form whatsoever must retain
+#    the following acknowledgment:
+# 
+#      "This product includes software developed by Digital Creations
+#      for use in the Z Object Publishing Environment
+#      (http://www.zope.org/)."
+# 
+#    Intact (re-)distributions of any official Zope release do not
+#    require an external acknowledgement.
+# 
+# 7. Modifications are encouraged but must be packaged separately as
+#    patches to official Zope releases.  Distributions that do not
+#    clearly separate the patches from the original work must be clearly
+#    labeled as unofficial distributions.  Modifications which do not
+#    carry the name Zope may be packaged in any form, as long as they
+#    conform to all of the clauses above.
+# 
+# 
+# Disclaimer
+# 
+#   THIS SOFTWARE IS PROVIDED BY DIGITAL CREATIONS ``AS IS'' AND ANY
+#   EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+#   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+#   PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL DIGITAL CREATIONS OR ITS
+#   CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+#   LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+#   USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+#   ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+#   OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+#   OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+#   SUCH DAMAGE.
+# 
+# 
+# This software consists of contributions made by Digital Creations and
+# many individuals on behalf of Digital Creations.  Specific
+# attributions are listed in the accompanying credits file.
+# 
+##############################################################################
+"""
+ZServer pipe utils. These producers basically function as callbacks.
+"""
+
+from medusa import asyncore
+import sys
+
+class ShutdownProducer:
+    "shuts down medusa"
+    
+    def more(self):
+        asyncore.close_all()
+
+
+class LoggingProducer:
+    "logs request"
+    
+    def __init__(self, logger, bytes, method='log'):
+        self.logger=logger
+        self.bytes=bytes
+        self.method=method
+
+    def more(self):
+        getattr(self.logger, self.method)(self.bytes)
+        return ''
+    
+
+class CallbackProducer:
+    "Performs a callback in the channel's thread"
+    
+    def __init__(self, callback):
+        self.callback=callback
+    
+    def more(self):
+        self.callback()
+        return ''
+        
\ No newline at end of file

ZServer/__init__.py

+##############################################################################
+# 
+# Zope Public License (ZPL) Version 1.0
+# -------------------------------------
+# 
+# Copyright (c) Digital Creations.  All rights reserved.
+# 
+# This license has been certified as Open Source(tm).
+# 
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+# 
+# 1. Redistributions in source code must retain the above copyright
+#    notice, this list of conditions, and the following disclaimer.
+# 
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions, and the following disclaimer in
+#    the documentation and/or other materials provided with the
+#    distribution.
+# 
+# 3. Digital Creations requests that attribution be given to Zope
+#    in any manner possible. Zope includes a "Powered by Zope"
+#    button that is installed by default. While it is not a license
+#    violation to remove this button, it is requested that the
+#    attribution remain. A significant investment has been put
+#    into Zope, and this effort will continue if the Zope community
+#    continues to grow. This is one way to assure that growth.
+# 
+# 4. All advertising materials and documentation mentioning
+#    features derived from or use of this software must display
+#    the following acknowledgement:
+# 
+#      "This product includes software developed by Digital Creations
+#      for use in the Z Object Publishing Environment
+#      (http://www.zope.org/)."
+# 
+#    In the event that the product being advertised includes an
+#    intact Zope distribution (with copyright and license included)
+#    then this clause is waived.
+# 
+# 5. Names associated with Zope or Digital Creations must not be used to
+#    endorse or promote products derived from this software without
+#    prior written permission from Digital Creations.
+# 
+# 6. Modified redistributions of any form whatsoever must retain
+#    the following acknowledgment:
+# 
+#      "This product includes software developed by Digital Creations
+#      for use in the Z Object Publishing Environment
+#      (http://www.zope.org/)."
+# 
+#    Intact (re-)distributions of any official Zope release do not
+#    require an external acknowledgement.
+# 
+# 7. Modifications are encouraged but must be packaged separately as
+#    patches to official Zope releases.  Distributions that do not
+#    clearly separate the patches from the original work must be clearly
+#    labeled as unofficial distributions.  Modifications which do not
+#    carry the name Zope may be packaged in any form, as long as they
+#    conform to all of the clauses above.
+# 
+# 
+# Disclaimer
+# 
+#   THIS SOFTWARE IS PROVIDED BY DIGITAL CREATIONS ``AS IS'' AND ANY
+#   EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+#   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+#   PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL DIGITAL CREATIONS OR ITS
+#   CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+#   LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+#   USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+#   ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+#   OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+#   OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+#   SUCH DAMAGE.
+# 
+# 
+# This software consists of contributions made by Digital Creations and
+# many individuals on behalf of Digital Creations.  Specific
+# attributions are listed in the accompanying credits file.
+# 
+##############################################################################
\ No newline at end of file

ZServer/start.py

 #!/usr/local/bin/python1.5.1
+"""ZServer start script
 
-"""Sample ZServer start script"""
+This start script configures ZServer.
 
-# configuration variables
+XXX comment this script much more to explain
+    what the different config option are.
+
+"""
+# Zope configuration
+#
+SOFTWARE_HOME='d:\\program files\\1.10.2'
+import sys,os
+sys.path.insert(0,os.path.join(SOFTWARE_HOME,'lib','python'))
+
+# ZServer configuration 
 #
 IP_ADDRESS=''
 HOST='localhost'
-DNS_IP='127.0.0.1'
+DNS_IP='205.240.25.3'
 HTTP_PORT=9673
 FTP_PORT=8021
 PCGI_PORT=88889
-PID_FILE='Zope.pid'
+PID_FILE=os.path.join(SOFTWARE_HOME,'var','ZServer.pid')
+LOG_FILE=os.path.join(SOFTWARE_HOME,'var','ZServer.log')
 MODULE='Main'
-LOG_FILE='ZServer.log'
 
-from medusa import resolver,logger,http_server,asyncore
 
-import zope_handler
-import ZServerFTP
-import ZServerPCGI
+from medusa import resolver,logger,http_server,asyncore
+from HTTPServer import zhttp_server, zhttp_handler
+from PCGIServer import PCGIServer
+from FTPServer import FTPServer
 
 rs = resolver.caching_resolver(DNS_IP)
 lg = logger.file_logger(LOG_FILE)
 
-hs = http_server.http_server(
+hs = zhttp_server(
 	ip=IP_ADDRESS,
 	port=HTTP_PORT,
 	resolver=rs,
 	logger_object=lg)
-	
-zh = zope_handler.zope_handler(MODULE,'')
-hs.install_handler(zh)
 
-zftp = ZServerFTP.FTPServer(
-	module=MODULE,
-	hostname=HOST,
-	port=FTP_PORT,
-	resolver=rs,
-	logger_object=lg)
+zh = zhttp_handler(MODULE,'')
+hs.install_handler(zh)
 
-zpcgi = ZServerPCGI.PCGIServer(
+zpcgi = PCGIServer(
 	module=MODULE,
 	ip=IP_ADDRESS,
 	port=PCGI_PORT,
 	pid_file=PID_FILE,
 	resolver=rs,
 	logger_object=lg)
+	
+zftp = FTPServer(
+	module=MODULE,
+	hostname=HOST,
+	port=FTP_PORT,
+	resolver=rs,
+	logger_object=lg)
+
 
 asyncore.loop()
 

lib/python/ZServer/CHANGES.txt

-ZServer Changes
-
-  This file gives information on changes made to ZServer over time,
-  things that need to be done before the next release and future
-  plans.
-
-  Releases
-
-    ZServer 1.0a2
-
-      New Features
-
-        Preliminary support for PCGI has been added. It is still not
-        complete and bug free. The main problem is that all newlines
-        seem to get converted to carriage return newline pairs...
-        
-        Simple controls to limit FTP connections have been added to
-        help prevent denial of service attacks.
-        
-        FTP now supports login with a username and directory, i.e.
-        'joe@Projects/JoesProject' which authenticates the login in
-        the specified directory. You can still use a normal username
-        and defer authentication until you cd to a directory where you
-        are defined.
-
-      Bug Fixed
-
-        Data was being dropped from POST requests because of a bug in
-        the sized input collection of asynchat.
-
-        HTTP Response headers were not being correctly set.
-
-        URL prefixes for the the Zope HTTP handler could not be set to
-        ''. Now the empty prefix is the default, to simplify URLs.
-
-    ZServer 1.0a1
-
-      New Features
-
-        Initial release. Includes new threaded architecture--currently
-        limited to a thread pool of 1. Includes preliminary FTP
-        support. Includes HTTP support.
-
-      Bugs Fixed
- 
-        None
- 
+ZServer Changes
+
+  This file gives information on changes made to ZServer over time,
+  things that need to be done before the next release and future
+  plans.
+
+  Releases
+
+    ZServer 1.0b1
+    
+      New Features
+      
+        Major code reorganization. Major architecture changes. Future
+        producers are gone. Use of special request and response objects
+        to do most of the heavy lifting. 
+
+        ZServer can now handle multiple HTTP requests per connection.
+
+        Now using (almost) unmodified Medusa sources.
+        
+        Added environment variable overriding to HTTPServer.py
+      
+      Bugs Fixed
+      
+        Using PCGI under IIS, now PATH_INFO begins with a /
+        
+        Fixed FTP passive mode response message IP address.
+
+      Known Bugs
+      
+        PCGI under IIS 4.0 is broken with respect to file uploads, and binary
+        data in general. IIS seems to convert \n to \r\n in binary data :-(
+
+        The latest medusa select_trigger.py doesn't seem to work under NT.
+
+      TODO
+      
+        stress test multi-threaded channel push. (done)
+        
+        test http 1.1 pipelined requests. (done)
+
+        iron out additional http 1.1 issues... (hmm)
+        
+        test ftp with emacs. (done)
+
+        remove cruft.
+        
+        fix medusa select_trigger under win32.
+
+        re-write Zope installers to install a ZServer start script.
+
+        get pcgi working with IIS and apache under win32, or at least get
+        it working under apache 1.3.6 on NT
+
+    ZServer 1.0a2
+
+      New Features
+
+        Preliminary support for PCGI has been added. It is still not
+        complete and bug free. The main problem is that all newlines
+        seem to get converted to carriage return newline pairs...
+        
+        Simple controls to limit FTP connections have been added to
+        help prevent denial of service attacks.
+        
+        FTP now supports login with a username and directory, i.e.
+        'joe@Projects/JoesProject' which authenticates the login in
+        the specified directory. You can still use a normal username
+        and defer authentication until you cd to a directory where you
+        are defined.
+
+      Bugs Fixed
+
+        Data was being dropped from POST requests because of a bug in
+        the sized input collection of asynchat.
+
+        HTTP Response headers were not being correctly set.
+
+        URL prefixes for the the Zope HTTP handler could not be set to
+        ''. Now the empty prefix is the default, to simplify URLs.
+
+    ZServer 1.0a1
+
+      New Features
+
+        Initial release. Includes new threaded architecture--currently
+        limited to a thread pool of 1. Includes preliminary FTP
+        support. Includes HTTP support.
+
+      Bugs Fixed
+ 
+        None
+ 

lib/python/ZServer/FTPRequest.py

+##############################################################################
+# 
+# Zope Public License (ZPL) Version 1.0
+# -------------------------------------
+# 
+# Copyright (c) Digital Creations.  All rights reserved.
+# 
+# This license has been certified as Open Source(tm).
+# 
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+# 
+# 1. Redistributions in source code must retain the above copyright
+#    notice, this list of conditions, and the following disclaimer.
+# 
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions, and the following disclaimer in
+#    the documentation and/or other materials provided with the
+#    distribution.
+# 
+# 3. Digital Creations requests that attribution be given to Zope
+#    in any manner possible. Zope includes a "Powered by Zope"
+#    button that is installed by default. While it is not a license
+#    violation to remove this button, it is requested that the
+#    attribution remain. A significant investment has been put
+#    into Zope, and this effort will continue if the Zope community
+#    continues to grow. This is one way to assure that growth.
+# 
+# 4. All advertising materials and documentation mentioning
+#    features derived from or use of this software must display
+#    the following acknowledgement:
+# 
+#      "This product includes software developed by Digital Creations
+#      for use in the Z Object Publishing Environment
+#      (http://www.zope.org/)."
+# 
+#    In the event that the product being advertised includes an
+#    intact Zope distribution (with copyright and license included)
+#    then this clause is waived.
+# 
+# 5. Names associated with Zope or Digital Creations must not be used to
+#    endorse or promote products derived from this software without
+#    prior written permission from Digital Creations.
+# 
+# 6. Modified redistributions of any form whatsoever must retain
+#    the following acknowledgment:
+# 
+#      "This product includes software developed by Digital Creations
+#      for use in the Z Object Publishing Environment
+#      (http://www.zope.org/)."
+# 
+#    Intact (re-)distributions of any official Zope release do not
+#    require an external acknowledgement.
+# 
+# 7. Modifications are encouraged but must be packaged separately as
+#    patches to official Zope releases.  Distributions that do not
+#    clearly separate the patches from the original work must be clearly
+#    labeled as unofficial distributions.  Modifications which do not
+#    carry the name Zope may be packaged in any form, as long as they
+#    conform to all of the clauses above.
+# 
+# 
+# Disclaimer
+# 
+#   THIS SOFTWARE IS PROVIDED BY DIGITAL CREATIONS ``AS IS'' AND ANY
+#   EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+#   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+#   PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL DIGITAL CREATIONS OR ITS
+#   CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+#   LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+#   USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+#   ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+#   OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+#   OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+#   SUCH DAMAGE.
+# 
+# 
+# This software consists of contributions made by Digital Creations and
+# many individuals on behalf of Digital Creations.  Specific
+# attributions are listed in the accompanying credits file.
+# 
+##############################################################################
+"""
+FTP Request class for FTP server.
+
+The FTP Request does the dirty work of turning an FTP request into something
+that ZPublisher can understand.
+"""
+
+from ZPublisher.HTTPRequest import HTTPRequest
+
+from cStringIO import StringIO
+import os
+from regsub import gsub
+from base64 import encodestring
+import string
+
+class FTPRequest(HTTPRequest):
+
+    def __init__(self, path, command, channel, response, stdin=None):
+        if stdin is None:
+            stdin=StringIO()
+        env=self._get_env(path, command, channel, stdin)
+        HTTPRequest.__init__(self, stdin, env, response, clean=1)
+
+    def _get_env(self, path, command, channel, stdin):
+        "Returns a CGI style environment"
+        env={}
+        env['SCRIPT_NAME']='/%s' % channel.module
+        env['REQUEST_METHOD']='GET' # XXX what should this be?
+        env['SERVER_SOFTWARE']=channel.server.SERVER_IDENT
+        if channel.userid != 'anonymous':
+            env['HTTP_AUTHORIZATION']='Basic %s' % gsub('\012','',
+                    encodestring('%s:%s' % (channel.userid, channel.password)))
+        env['SERVER_NAME']=channel.server.hostname
+        env['SERVER_PORT']=str(channel.server.port)
+        env['REMOTE_ADDR']=channel.client_addr[0]
+        env['GATEWAY_INTERFACE']='CGI/1.1' # that's stretching it ;-)
+        
+        # FTP commands
+        #
+        if type(command)==type(()):
+            args=command[1:]
+            command=command[0]
+        if command in ('LST','CWD','PASS'):
+            env['PATH_INFO']=self._join_paths(channel.path, path, 'manage_FTPlist')
+        elif command in ('MDTM','SIZE'):
+            env['PATH_INFO']=self._join_paths(channel.path, path, 'manage_FTPstat')
+        elif command=='RETR':
+            env['PATH_INFO']=self._join_paths(channel.path, path, 'manage_FTPget')
+        elif command in ('RMD','DELE'):
+            env['PATH_INFO']=self._join_paths(channel.path, path, 'manage_delObjects')
+            env['QUERY_STRING']='ids=%s' % args[0]
+        elif command=='MKD':
+            env['PATH_INFO']=self._join_paths(channel.path, path, 'manage_addFolder')
+            env['QUERY_STRING']='id=%s' % args[0]
+        elif command=='STOR':
+            env['PATH_INFO']=self._join_paths(channel.path, path)
+            env['REQUEST_METHOD']='PUT'
+            env['CONTENT_LENGTH']=len(stdin.getvalue())
+        else:
+            env['PATH_INFO']=self._join_paths(channel.path, path, command)
+        return env
+    
+    def _join_paths(self,*args):
+        path=apply(os.path.join,args)
+        path=os.path.normpath(path)
+        if os.sep != '/':
+            path=string.replace(path,os.sep,'/')
+        return path
+        
\ No newline at end of file

lib/python/ZServer/FTPResponse.py

+##############################################################################
+# 
+# Zope Public License (ZPL) Version 1.0
+# -------------------------------------
+# 
+# Copyright (c) Digital Creations.  All rights reserved.
+# 
+# This license has been certified as Open Source(tm).
+# 
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+# 
+# 1. Redistributions in source code must retain the above copyright
+#    notice, this list of conditions, and the following disclaimer.
+# 
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions, and the following disclaimer in
+#    the documentation and/or other materials provided with the
+#    distribution.
+# 
+# 3. Digital Creations requests that attribution be given to Zope
+#    in any manner possible. Zope includes a "Powered by Zope"
+#    button that is installed by default. While it is not a license
+#    violation to remove this button, it is requested that the
+#    attribution remain. A significant investment has been put
+#    into Zope, and this effort will continue if the Zope community
+#    continues to grow. This is one way to assure that growth.
+# 
+# 4. All advertising materials and documentation mentioning
+#    features derived from or use of this software must display
+#    the following acknowledgement:
+# 
+#      "This product includes software developed by Digital Creations
+#      for use in the Z Object Publishing Environment
+#      (http://www.zope.org/)."
+# 
+#    In the event that the product being advertised includes an
+#    intact Zope distribution (with copyright and license included)
+#    then this clause is waived.
+# 
+# 5. Names associated with Zope or Digital Creations must not be used to
+#    endorse or promote products derived from this software without
+#    prior written permission from Digital Creations.
+# 
+# 6. Modified redistributions of any form whatsoever must retain
+#    the following acknowledgment:
+# 
+#      "This product includes software developed by Digital Creations
+#      for use in the Z Object Publishing Environment
+#      (http://www.zope.org/)."
+# 
+#    Intact (re-)distributions of any official Zope release do not
+#    require an external acknowledgement.
+# 
+# 7. Modifications are encouraged but must be packaged separately as
+#    patches to official Zope releases.  Distributions that do not
+#    clearly separate the patches from the original work must be clearly
+#    labeled as unofficial distributions.  Modifications which do not
+#    carry the name Zope may be packaged in any form, as long as they
+#    conform to all of the clauses above.
+# 
+# 
+# Disclaimer
+# 
+#   THIS SOFTWARE IS PROVIDED BY DIGITAL CREATIONS ``AS IS'' AND ANY
+#   EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+#   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+#   PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL DIGITAL CREATIONS OR ITS
+#   CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+#   LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+#   USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+#   ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+#   OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+#   OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+#   SUCH DAMAGE.
+# 
+# 
+# This software consists of contributions made by Digital Creations and
+# many individuals on behalf of Digital Creations.  Specific
+# attributions are listed in the accompanying credits file.
+# 
+##############################################################################
+"""
+Response class for the FTP Server.
+"""
+
+from ZPublisher.HTTPResponse import HTTPResponse
+from PubCore.ZEvent import Wakeup
+from cStringIO import StringIO
+import marshal
+
+
+class FTPResponse(HTTPResponse):
+    """
+    Response to an FTP command
+    """
+
+    def _finish(self):
+        self.stdout.finish(self)
+
+    def _marshalledBody(self):
+        return marshal.loads(self.body)
+
+ 
+class CallbackPipe:
+    """
+    Sends response object to a callback. Doesn't write anything.
+    The callback takes place in Medusa's thread, not the request thread.
+    """
+    def __init__(self, callback, args):
+        self._callback=callback
+        self._args=args
+        
+    def write(self, text):
+        pass
+        
+    def close(self):
+        pass
+        
+    def finish(self, response):
+        self._response=response
+        Wakeup(self.apply) # move callback to medusas thread
+        
+    def apply(self):
+        result=apply(self._callback, self._args+(self._response,))
+       
+        # is this necessary to break cycles?
+        self._callback=None
+        self._response=None
+        self._args=None
+        
+        return result    
+
+def make_response(callback,*args):
+    # XXX should this be the FTPResponse constructor instead?
+	return FTPResponse(stdout=CallbackPipe(callback, args), stderr=StringIO())
+    
\ No newline at end of file

lib/python/ZServer/Producers.py

+##############################################################################
+# 
+# Zope Public License (ZPL) Version 1.0
+# -------------------------------------
+# 
+# Copyright (c) Digital Creations.  All rights reserved.
+# 
+# This license has been certified as Open Source(tm).
+# 
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+# 
+# 1. Redistributions in source code must retain the above copyright
+#    notice, this list of conditions, and the following disclaimer.
+# 
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions, and the following disclaimer in
+#    the documentation and/or other materials provided with the
+#    distribution.
+# 
+# 3. Digital Creations requests that attribution be given to Zope
+#    in any manner possible. Zope includes a "Powered by Zope"
+#    button that is installed by default. While it is not a license
+#    violation to remove this button, it is requested that the
+#    attribution remain. A significant investment has been put
+#    into Zope, and this effort will continue if the Zope community
+#    continues to grow. This is one way to assure that growth.
+# 
+# 4. All advertising materials and documentation mentioning
+#    features derived from or use of this software must display
+#    the following acknowledgement:
+# 
+#      "This product includes software developed by Digital Creations
+#      for use in the Z Object Publishing Environment
+#      (http://www.zope.org/)."
+# 
+#    In the event that the product being advertised includes an
+#    intact Zope distribution (with copyright and license included)
+#    then this clause is waived.
+# 
+# 5. Names associated with Zope or Digital Creations must not be used to
+#    endorse or promote products derived from this software without
+#    prior written permission from Digital Creations.
+# 
+# 6. Modified redistributions of any form whatsoever must retain
+#    the following acknowledgment:
+# 
+#      "This product includes software developed by Digital Creations
+#      for use in the Z Object Publishing Environment
+#      (http://www.zope.org/)."
+# 
+#    Intact (re-)distributions of any official Zope release do not
+#    require an external acknowledgement.
+# 
+# 7. Modifications are encouraged but must be packaged separately as
+#    patches to official Zope releases.  Distributions that do not
+#    clearly separate the patches from the original work must be clearly
+#    labeled as unofficial distributions.  Modifications which do not
+#    carry the name Zope may be packaged in any form, as long as they
+#    conform to all of the clauses above.
+# 
+# 
+# Disclaimer
+# 
+#   THIS SOFTWARE IS PROVIDED BY DIGITAL CREATIONS ``AS IS'' AND ANY
+#   EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+#   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+#   PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL DIGITAL CREATIONS OR ITS
+#   CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+#   LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+#   USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+#   ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+#   OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+#   OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+#   SUCH DAMAGE.
+# 
+# 
+# This software consists of contributions made by Digital Creations and
+# many individuals on behalf of Digital Creations.  Specific
+# attributions are listed in the accompanying credits file.
+# 
+##############################################################################
+"""
+ZServer pipe utils. These producers basically function as callbacks.
+"""
+
+from medusa import asyncore
+import sys
+
+class ShutdownProducer:
+    "shuts down medusa"
+    
+    def more(self):
+        asyncore.close_all()
+
+
+class LoggingProducer:
+    "logs request"
+    
+    def __init__(self, logger, bytes, method='log'):
+        self.logger=logger
+        self.bytes=bytes
+        self.method=method
+
+    def more(self):
+        getattr(self.logger, self.method)(self.bytes)
+        return ''
+    
+
+class CallbackProducer:
+    "Performs a callback in the channel's thread"
+    
+    def __init__(self, callback):
+        self.callback=callback
+    
+    def more(self):
+        self.callback()
+        return ''
+        
\ No newline at end of file

lib/python/ZServer/__init__.py

+##############################################################################
+# 
+# Zope Public License (ZPL) Version 1.0
+# -------------------------------------
+# 
+# Copyright (c) Digital Creations.  All rights reserved.
+# 
+# This license has been certified as Open Source(tm).
+# 
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+# 
+# 1. Redistributions in source code must retain the above copyright
+#    notice, this list of conditions, and the following disclaimer.
+# 
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions, and the following disclaimer in
+#    the documentation and/or other materials provided with the
+#    distribution.
+# 
+# 3. Digital Creations requests that attribution be given to Zope
+#    in any manner possible. Zope includes a "Powered by Zope"
+#    button that is installed by default. While it is not a license
+#    violation to remove this button, it is requested that the
+#    attribution remain. A significant investment has been put
+#    into Zope, and this effort will continue if the Zope community
+#    continues to grow. This is one way to assure that growth.
+# 
+# 4. All advertising materials and documentation mentioning
+#    features derived from or use of this software must display
+#    the following acknowledgement:
+# 
+#      "This product includes software developed by Digital Creations
+#      for use in the Z Object Publishing Environment
+#      (http://www.zope.org/)."
+# 
+#    In the event that the product being advertised includes an
+#    intact Zope distribution (with copyright and license included)
+#    then this clause is waived.
+# 
+# 5. Names associated with Zope or Digital Creations must not be used to
+#    endorse or promote products derived from this software without
+#    prior written permission from Digital Creations.
+# 
+# 6. Modified redistributions of any form whatsoever must retain
+#    the following acknowledgment:
+# 
+#      "This product includes software developed by Digital Creations
+#      for use in the Z Object Publishing Environment
+#      (http://www.zope.org/)."
+# 
+#    Intact (re-)distributions of any official Zope release do not
+#    require an external acknowledgement.
+# 
+# 7. Modifications are encouraged but must be packaged separately as
+#    patches to official Zope releases.  Distributions that do not
+#    clearly separate the patches from the original work must be clearly
+#    labeled as unofficial distributions.  Modifications which do not
+#    carry the name Zope may be packaged in any form, as long as they
+#    conform to all of the clauses above.
+# 
+# 
+# Disclaimer
+# 
+#   THIS SOFTWARE IS PROVIDED BY DIGITAL CREATIONS ``AS IS'' AND ANY
+#   EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+#   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+#   PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL DIGITAL CREATIONS OR ITS
+#   CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+#   LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+#   USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+#   ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+#   OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+#   OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+#   SUCH DAMAGE.
+# 
+# 
+# This software consists of contributions made by Digital Creations and
+# many individuals on behalf of Digital Creations.  Specific
+# attributions are listed in the accompanying credits file.
+# 
+##############################################################################
\ No newline at end of file

lib/python/ZServer/start.py

 #!/usr/local/bin/python1.5.1
+"""ZServer start script
 
-"""Sample ZServer start script"""
+This start script configures ZServer.
 
-# configuration variables
+XXX comment this script much more to explain
+    what the different config option are.
+
+"""
+# Zope configuration
+#
+SOFTWARE_HOME='d:\\program files\\1.10.2'
+import sys,os
+sys.path.insert(0,os.path.join(SOFTWARE_HOME,'lib','python'))
+
+# ZServer configuration 
 #
 IP_ADDRESS=''
 HOST='localhost'
-DNS_IP='127.0.0.1'
+DNS_IP='205.240.25.3'
 HTTP_PORT=9673
 FTP_PORT=8021
 PCGI_PORT=88889
-PID_FILE='Zope.pid'
+PID_FILE=os.path.join(SOFTWARE_HOME,'var','ZServer.pid')
+LOG_FILE=os.path.join(SOFTWARE_HOME,'var','ZServer.log')
 MODULE='Main'
-LOG_FILE='ZServer.log'
 
-from medusa import resolver,logger,http_server,asyncore
 
-import zope_handler
-import ZServerFTP
-import ZServerPCGI
+from medusa import resolver,logger,http_server,asyncore
+from HTTPServer import zhttp_server, zhttp_handler
+from PCGIServer import PCGIServer
+from FTPServer import FTPServer
 
 rs = resolver.caching_resolver(DNS_IP)
 lg = logger.file_logger(LOG_FILE)
 
-hs = http_server.http_server(
+hs = zhttp_server(
 	ip=IP_ADDRESS,
 	port=HTTP_PORT,
 	resolver=rs,
 	logger_object=lg)
-	
-zh = zope_handler.zope_handler(MODULE,'')
-hs.install_handler(zh)
 
-zftp = ZServerFTP.FTPServer(
-	module=MODULE,
-	hostname=HOST,
-	port=FTP_PORT,
-	resolver=rs,
-	logger_object=lg)
+zh = zhttp_handler(MODULE,'')
+hs.install_handler(zh)
 
-zpcgi = ZServerPCGI.PCGIServer(
+zpcgi = PCGIServer(
 	module=MODULE,
 	ip=IP_ADDRESS,
 	port=PCGI_PORT,
 	pid_file=PID_FILE,
 	resolver=rs,
 	logger_object=lg)
+	
+zftp = FTPServer(
+	module=MODULE,
+	hostname=HOST,
+	port=FTP_PORT,
+	resolver=rs,
+	logger_object=lg)
+
 
 asyncore.loop()