dinislage/web2py
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed quote in url rewrite, thanks Michael

Browse Source
This commit is contained in:
mdipierro
2012-06-25 14:21:18 -05:00
parent 9bc25ea9ff
commit 5e0dddffce
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
VERSION
+1 -1
View File
@@ -1 +1 @@
Version 2.00.0 (2012-06-25 14:18:18) dev Version 2.00.0 (2012-06-25 14:21:16) dev
gluon/rewrite.py
+7 -3
View File
@@ -179,7 +179,7 @@ def try_rewrite_on_error(http_response, request, environ, ticket=None):
path_info, query_string = uri, '' path_info, query_string = uri, ''
query_string += \ query_string += \
'code=%s&ticket=%s&requested_uri=%s&request_url=%s' % \ 'code=%s&ticket=%s&requested_uri=%s&request_url=%s' % \
(status,ticket,request.env.request_uri,request.url) (status,ticket,urllib.quote_plus(request.env.request_uri),request.url)
if uri.startswith('http://') or uri.startswith('https://'): if uri.startswith('http://') or uri.startswith('https://'):
# make up a response # make up a response
url = path_info+'?'+query_string url = path_info+'?'+query_string
@@ -214,10 +214,14 @@ def try_redirect_on_error(http_object, request, ticket=None):
break break
elif '?' in redir: elif '?' in redir:
url = '%s&code=%s&ticket=%s&requested_uri=%s&request_url=%s' % \ url = '%s&code=%s&ticket=%s&requested_uri=%s&request_url=%s' % \
(redir,status,ticket,request.env.request_uri,request.url) (redir,status,ticket,
urllib.quote_plus(request.env.request_uri),
request.url)
else: else:
url = '%s?code=%s&ticket=%s&requested_uri=%s&request_url=%s' % \ url = '%s?code=%s&ticket=%s&requested_uri=%s&request_url=%s' % \
(redir,status,ticket,request.env.request_uri,request.url) (redir,status,ticket,
urllib.quote_plus(request.env.request_uri),
request.url)
return HTTP(303, return HTTP(303,
'You are being redirected <a href="%s">here</a>' % url, 'You are being redirected <a href="%s">here</a>' % url,
Location=url) Location=url)