summaryrefslogtreecommitdiff
path: root/flup/server/ajp_base.py
diff options
context:
space:
mode:
authorAllan Saddi <allan@saddi.com>2008-07-22 09:53:30 -0700
committerAllan Saddi <allan@saddi.com>2008-07-22 09:53:30 -0700
commit206878f9439d93e0ae08162df28b85bc9a54a369 (patch)
treea1101f4365387ef7409c18917bd709cb5e0f3500 /flup/server/ajp_base.py
parent80ef6eecad7b42dffdb38fa510d71ebe3a012581 (diff)
downloadflup-206878f9439d93e0ae08162df28b85bc9a54a369.tar.gz
Revise previous patch for compatibility with pre-2.5 Python.
Diffstat (limited to 'flup/server/ajp_base.py')
-rw-r--r--flup/server/ajp_base.py8
1 files changed, 6 insertions, 2 deletions
diff --git a/flup/server/ajp_base.py b/flup/server/ajp_base.py
index fd560c2..e4c38f2 100644
--- a/flup/server/ajp_base.py
+++ b/flup/server/ajp_base.py
@@ -924,9 +924,13 @@ class BaseAJPServer(object):
environ['PATH_INFO'] = value[len(scriptName):]
environ['SCRIPT_NAME'] = scriptName
+ reqUri = None
+ if environ.has_key('REQUEST_URI'):
+ reqUri = environ['REQUEST_URI'].split('?', 1)
+
if not environ.has_key('QUERY_STRING') or not environ['QUERY_STRING']:
- if environ.has_key['REQUEST_URI']:
- environ['QUERY_STRING'] = environ['REQUEST_URI'].partition('?')[2]
+ if reqUri is not None and len(reqUri) > 1:
+ environ['QUERY_STRING'] = reqUri[1]
else:
environ['QUERY_STRING'] = ''