[Zope-Checkins] CVS: Zope/lib/python/Controller - Main.py:1.1.2.5
Chris McDonough
chrism@zope.com
Wed, 18 Sep 2002 16:46:48 -0400
Update of /cvs-repository/Zope/lib/python/Controller
In directory cvs.zope.org:/tmp/cvs-serv26512
Modified Files:
Tag: chrism-install-branch
Main.py
Log Message:
Backport z2.py bugfix for socket.error.
=== Zope/lib/python/Controller/Main.py 1.1.2.4 => 1.1.2.5 ===
--- Zope/lib/python/Controller/Main.py:1.1.2.4 Mon Sep 16 01:49:42 2002
+++ Zope/lib/python/Controller/Main.py Wed Sep 18 16:46:47 2002
@@ -216,6 +216,7 @@
'socktype':'TCP',
'protocol':'HTTP',
'switch':'http_server_ports'}
+ raise
# Handler for a published module. zhttp_handler takes 3 arguments:
# The name of the module to publish, and optionally the URI base
# which is basically the SCRIPT_NAME, and optionally a dictionary
@@ -249,6 +250,7 @@
'socktype':'TCP',
'protocol':'WebDAV source',
'switch':'webdav_source_server_ports'}
+ raise
# Handler for a published module. zhttp_handler takes 3 arguments:
# The name of the module to publish, and optionally the URI base
@@ -291,6 +293,7 @@
'socktype':'TCP',
'protocol':'FTP',
'switch':'ftp_server_ports'}
+ raise
# PCGI Server
if PCGI_FILE and not READ_ONLY:
@@ -325,6 +328,7 @@
'socktype':'TCP',
'protocol':'FastCGI',
'switch':'fastcgi_resource_port_or_path'}
+ raise
# Monitor Server
@@ -351,6 +355,7 @@
'socktype':'TCP',
'protocol':'monitor server',
'switch':'monitor_server_ports'}
+ raise
if ICP_PORT:
if isinstance(ICP_PORT, IntType): ICP_PORT=((IP_ADDRESS, ICP_PORT),)
@@ -364,6 +369,7 @@
'socktype':'UDP',
'protocol':'ICP',
'switch':'icp_server_ports'}
+ raise
# Warn if we were started as nobody.
try: