From c29f4a39b1ef982ff9502f26c49af7699b06be35 Mon Sep 17 00:00:00 2001
From: "Silas S. Brown" <ssb22@cam.ac.uk>
Date: Mon, 16 May 2016 17:19:09 +0000
Subject: [PATCH] Update Web Adjuster
git-svn-id: http://svn.code.sf.net/p/e-guidedog/code/ssb22/adjuster@2491 29193198-4895-4776-b068-10539e920549
---
adjuster.py | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/adjuster.py b/adjuster.py
index f6ee60a..531e96e 100755
--- a/adjuster.py
+++ b/adjuster.py
@@ -1536,11 +1536,9 @@ document.forms[0].i.focus()
def doReq(self):
debuglog("doReq "+self.request.uri)
- if wsgi_mode and self.request.path==urllib.quote(os.environ.get("SCRIPT_NAME",'0')+os.environ.get("PATH_INFO","")) and 'SCRIPT_URL' in os.environ:
+ if wsgi_mode and self.request.path==urllib.quote(os.environ.get("SCRIPT_NAME","")+os.environ.get("PATH_INFO","")) and 'SCRIPT_URL' in os.environ:
# workaround for Tornado 2.x limitation when used with htaccess redirects
- self.request.path = os.environ['SCRIPT_URL']
- self.request.uri = self.request.path
- if "QUERY_STRING" in os.environ: self.request.uri += '?'+os.environ["QUERY_STRING"]
+ self.request.uri = self.request.path = os.environ['SCRIPT_URL']
if self.request.headers.get("User-Agent","")=="ping":
if self.request.uri=="/ping2": return self.answerPing(True)
elif self.request.uri=="/ping": return self.answerPing(False)
--
GitLab