summaryrefslogtreecommitdiff
path: root/odoo/http.py
diff options
context:
space:
mode:
authorChristophe Simonis <chs@odoo.com>2018-05-18 18:59:06 +0200
committerChristophe Simonis <chs@odoo.com>2018-05-18 18:59:06 +0200
commit8383181b8f74c87c43bc6b8c97d84e550d5d89c4 (patch)
tree9184a391e492bebf64cc0d1dbe5ffcaa7d7b0fbd /odoo/http.py
parent8ac98fc78a3794e06481b02a431bcdc386a5a6ee (diff)
parent021d0e6a98bb9baa0d554d4e8b5717c7893a7641 (diff)
[MERGE] forward port branch saas-15 up to 021d0e6a98b
Diffstat (limited to 'odoo/http.py')
-rw-r--r--odoo/http.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/odoo/http.py b/odoo/http.py
index 415111e18d7..7001b2a1278 100644
--- a/odoo/http.py
+++ b/odoo/http.py
@@ -166,7 +166,7 @@ def redirect_with_hash(url, code=303):
# FIXME: decide whether urls should be bytes or text, apparently
# addons/website/controllers/main.py:91 calls this with a bytes url
# but addons/web/controllers/main.py:481 uses text... (blows up on login)
- url = pycompat.to_text(url)
+ url = pycompat.to_text(url).strip()
if urls.url_parse(url, scheme='http').scheme not in ('http', 'https'):
url = u'http://' + url
url = url.replace("'", "%27").replace("<", "%3C")