summaryrefslogtreecommitdiff
path: root/paste/servers
diff options
context:
space:
mode:
authorianb <devnull@localhost>2005-06-02 20:50:04 +0000
committerianb <devnull@localhost>2005-06-02 20:50:04 +0000
commitb02d8e48c0e225cb9c2364788b91fd7ee1a2de01 (patch)
treecba2778cbfd10b54e14f8d7ee95faabc50838229 /paste/servers
parent9ac1eb4da881df9f0f98879ee0e4e85307919856 (diff)
downloadpaste-b02d8e48c0e225cb9c2364788b91fd7ee1a2de01.tar.gz
Allow root_url = None (auto SCRIPT_NAME)
Diffstat (limited to 'paste/servers')
-rw-r--r--paste/servers/ajp_threaded_server.py3
-rw-r--r--paste/servers/scgi_threaded_server.py3
2 files changed, 4 insertions, 2 deletions
diff --git a/paste/servers/ajp_threaded_server.py b/paste/servers/ajp_threaded_server.py
index d1e6e92..8bdedc7 100644
--- a/paste/servers/ajp_threaded_server.py
+++ b/paste/servers/ajp_threaded_server.py
@@ -8,7 +8,8 @@ def serve(conf, app):
return serve_server(conf, app, WSGIServer)
def serve_server(conf, app, server_class):
- root_url = conf.get('root_url', '').rstrip('/')
+ root_url = conf.get('root_url', '')
+ root_url = root_url and root_url.rstrip('/')
server = server_class(
app,
scriptName=root_url,
diff --git a/paste/servers/scgi_threaded_server.py b/paste/servers/scgi_threaded_server.py
index 9c1f10b..a023e7f 100644
--- a/paste/servers/scgi_threaded_server.py
+++ b/paste/servers/scgi_threaded_server.py
@@ -8,7 +8,8 @@ def serve(conf, app):
return serve_server(conf, app, WSGIServer)
def serve_server(conf, app, server_class):
- root_url = conf.get('root_url', '').rstrip('/')
+ root_url = conf.get('root_url', '')
+ root_url = root_url and root_url.rstrip('/')
server = server_class(
app,
bindAddress=(conf.get('host', 'localhost'),