summaryrefslogtreecommitdiff
path: root/addons/web/controllers
diff options
context:
space:
mode:
authorChristophe Simonis <chs@odoo.com>2014-08-20 17:51:20 +0200
committerChristophe Simonis <chs@odoo.com>2014-08-20 17:51:20 +0200
commitddef2dd10aabf0e77bf63c462d5f29e353b6b53a (patch)
tree9223b5781b9aa173b45539e652f6d7c7717f2c4e /addons/web/controllers
parente2532dd8e0ee1b10fa0e1e06bb1c869d4a56c833 (diff)
parent8f13e8320edaca58fe19bb4ed4a2ad515f1c8515 (diff)
[MERGE] forward port of branch saas-3 up to 8f13e83
Diffstat (limited to 'addons/web/controllers')
-rw-r--r--addons/web/controllers/main.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py
index 7ac552ffb85..4ee3f5f25ae 100644
--- a/addons/web/controllers/main.py
+++ b/addons/web/controllers/main.py
@@ -860,7 +860,8 @@ class Proxy(http.Controller):
from werkzeug.test import Client
from werkzeug.wrappers import BaseResponse
- return Client(request.httprequest.app, BaseResponse).get(path).data
+ base_url = request.httprequest.base_url
+ return Client(request.httprequest.app, BaseResponse).get(path, base_url=base_url).data
class Database(http.Controller):