Merge from the new-install-branch: work with the slightly modified ZServer

package.

lib/python/Lifetime.py

@@ -28,7 +28,8 @@ def shutdown(exit_code,fast = 0):
     global _shutdown_timeout
     if _shutdown_phase == 0:
         # Thread safety? proably no need to care
-        sys.ZServerExitCode = exit_code
+        import ZServer
+        ZServer.exit_code = exit_code
         _shutdown_phase = 1
     if fast:
         # Someone wants us to shutdown fast. This is hooked into SIGTERM - so possibly

lib/python/ZPublisher/HTTPResponse.py

@@ -12,8 +12,8 @@
 ##############################################################################
 '''CGI Response Output formatter
 
-$Id: HTTPResponse.py,v 1.72 2002/12/22 18:31:46 efge Exp $'''
-__version__ = '$Revision: 1.72 $'[11:-2]
+$Id: HTTPResponse.py,v 1.73 2003/03/18 21:39:06 fdrake Exp $'''
+__version__ = '$Revision: 1.73 $'[11:-2]
 
 import types, os, sys, re
 import zlib, struct
@@ -190,7 +190,8 @@ class HTTPResponse(BaseResponse):
     def _requestShutdown(self, exitCode=0):
         """Request that the server shut down with exitCode after fulfilling
            the current request."""
-        sys.ZServerExitCode = exitCode
+        import ZServer
+        ZServer.exit_code = exitCode
         self._shutdown_flag = 1
 
     def _shutdownRequested(self):