[MERGE] backport trunk revision 5053 fva@openerp.com-20140206110134-jk5zbd8cc6x1ebh5

bzr revid: chs@openerp.com-20140206131116-we6rlic5fu09xh8q
2014-02-06 14:11:16 +01:00 · 2014-02-06 14:11:16 +01:00 · 5a022d6ab3
parent 73d675a73d
commit 5a022d6ab3
1 changed files with 1 additions and 0 deletions
--- a/openerp/http.py
+++ b/openerp/http.py
@ -441,6 +441,7 @@ class HttpRequest(WebRequest):
            elif request.func.routing.get('methods'):
                methods = ', '.join(request.func.routing['methods'])
            response.headers.set('Access-Control-Allow-Methods', methods)
+            response.headers.set('Access-Control-Max-Age',60*60*24)
            response.headers.set('Access-Control-Allow-Headers', 'Origin, X-Requested-With, Content-Type, Accept')
            return response