From 4fab5b0ff69bfed569fbf76b5f409b6418b13ca9 Mon Sep 17 00:00:00 2001 From: Allan Saddi Date: Sat, 16 Apr 2005 09:53:04 +0000 Subject: Forgot to update the subclasses. --- flup/server/scgi.py | 10 ++++++++-- flup/server/scgi_fork.py | 10 ++++++++-- 2 files changed, 16 insertions(+), 4 deletions(-) (limited to 'flup') diff --git a/flup/server/scgi.py b/flup/server/scgi.py index f8d0ed5..86e287d 100644 --- a/flup/server/scgi.py +++ b/flup/server/scgi.py @@ -25,7 +25,7 @@ # $Id$ """ -scgi - an SCGI/WSGI gateway. (I might have to rename this module.) +scgi - an SCGI/WSGI gateway. For more information about SCGI and mod_scgi for Apache1/Apache2, see . @@ -87,11 +87,16 @@ class WSGIServer(BaseSCGIServer, ThreadedServer): of preforking to be quite superior. So if your application really doesn't mind running in multiple processes, go use SWAP. ;) """ - def __init__(self, application, environ=None, + def __init__(self, application, scriptName='', environ=None, multithreaded=True, bindAddress=('localhost', 4000), allowedServers=None, loggingLevel=logging.INFO, **kw): """ + scriptName is the initial portion of the URL path that "belongs" + to your application. It is used to determine PATH_INFO (which doesn't + seem to be passed in). An empty scriptName means your application + is mounted at the root of your virtual host. + environ, which must be a dictionary, can contain any additional environment variables you want to pass to your application. @@ -107,6 +112,7 @@ class WSGIServer(BaseSCGIServer, ThreadedServer): loggingLevel sets the logging level of the module-level logger. """ BaseSCGIServer.__init__(self, application, + scriptName=scriptName, environ=environ, multithreaded=multithreaded, bindAddress=bindAddress, diff --git a/flup/server/scgi_fork.py b/flup/server/scgi_fork.py index 52dd481..9609d69 100644 --- a/flup/server/scgi_fork.py +++ b/flup/server/scgi_fork.py @@ -25,7 +25,7 @@ # $Id$ """ -scgi - an SCGI/WSGI gateway. (I might have to rename this module.) +scgi - an SCGI/WSGI gateway. For more information about SCGI and mod_scgi for Apache1/Apache2, see . @@ -87,10 +87,15 @@ class WSGIServer(BaseSCGIServer, PreforkServer): of preforking to be quite superior. So if your application really doesn't mind running in multiple processes, go use SWAP. ;) """ - def __init__(self, application, environ=None, + def __init__(self, application, scriptName='', environ=None, bindAddress=('localhost', 4000), allowedServers=None, loggingLevel=logging.INFO, **kw): """ + scriptName is the initial portion of the URL path that "belongs" + to your application. It is used to determine PATH_INFO (which doesn't + seem to be passed in). An empty scriptName means your application + is mounted at the root of your virtual host. + environ, which must be a dictionary, can contain any additional environment variables you want to pass to your application. @@ -106,6 +111,7 @@ class WSGIServer(BaseSCGIServer, PreforkServer): loggingLevel sets the logging level of the module-level logger. """ BaseSCGIServer.__init__(self, application, + scriptName=scriptName, environ=environ, multithreaded=False, bindAddress=bindAddress, -- cgit v1.2.1