diff options
| author | Christophe Simonis <chs@odoo.com> | 2017-09-06 17:40:59 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2017-09-06 17:40:59 +0200 |
| commit | d5382abeaad4d93b8def7e63cd47a86baaba8f0b (patch) | |
| tree | 6364ff760709b541eebdde4b04494b480dec87fb /odoo/http.py | |
| parent | c75fe95dfca366bf6c3b6a51908677039488aa4f (diff) | |
| parent | b8dd34fcbb895b8d62f3e133dcf5ee6f40a1400d (diff) | |
[MERGE] forward port branch saas-17 up to b8dd34fcbb8
Diffstat (limited to 'odoo/http.py')
| -rw-r--r-- | odoo/http.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/odoo/http.py b/odoo/http.py index 288f13be8e3..de06e2472f3 100644 --- a/odoo/http.py +++ b/odoo/http.py @@ -306,7 +306,7 @@ class WebRequest(object): odoo.tools.debugger.post_mortem( odoo.tools.config, sys.exc_info()) # otherwise "no active exception to reraise" - raise exception + raise pycompat.reraise(type(exception), exception, sys.exc_info()[2]) def _call_function(self, *args, **kwargs): request = self @@ -1420,7 +1420,8 @@ class Root(object): # (the one using the cookie). That is a special feature of the Session Javascript class. # - It could allow session fixation attacks. if not explicit_session and hasattr(response, 'set_cookie'): - response.set_cookie('session_id', httprequest.session.sid, max_age=90 * 24 * 60 * 60) + response.set_cookie( + 'session_id', httprequest.session.sid, max_age=90 * 24 * 60 * 60, httponly=True) return response |