From a6d6a05db7f53afb0b1251bd8b73c791277df84d Mon Sep 17 00:00:00 2001
From: "Silas S. Brown" <ssb22@cam.ac.uk>
Date: Tue, 17 May 2016 09:04:31 +0000
Subject: [PATCH] Update Web Adjuster
git-svn-id: http://svn.code.sf.net/p/e-guidedog/code/ssb22/adjuster@2493 29193198-4895-4776-b068-10539e920549
---
adjuster.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/adjuster.py b/adjuster.py
index b7fdb94..774ddcb 100755
--- a/adjuster.py
+++ b/adjuster.py
@@ -1537,7 +1537,7 @@ 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","")+os.environ.get("PATH_INFO","")) and 'SCRIPT_URL' in os.environ:
- # workaround for Tornado 2.x limitation when used with htaccess redirects
+ # workaround for Tornado 2.x limitation when used with CGI and htaccess redirects
self.request.uri = self.request.path = os.environ['SCRIPT_URL']
if os.environ.get("QUERY_STRING","") == "" and "REDIRECT_QUERY_STRING" in os.environ: self.request.arguments = urlparse.parse_qs(os.environ["REDIRECT_QUERY_STRING"])
if self.request.headers.get("User-Agent","")=="ping":
@@ -1954,7 +1954,7 @@ document.forms[0].i.focus()
runFilter("lame --quiet --mp3input -m m --abr %d - -o -" % options.bitrate,body,callback,False) # -m m = mono (TODO: optional?)
else: callback(body,"")
def getHtmlFilter(self,filterNo=None):
- if not options.htmlFilterName: return None
+ if not options.htmlFilterName: return options.htmlFilter # unconditional
if filterNo and '#' in options.htmlFilter:
return options.htmlFilter.split('#')[filterNo]
anf = self.getCookie("adjustNoFilter")
--
GitLab