odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[ADD] cache 

bzr revid: fme@openerp.com-20140410182723-x1aoo2o0zhgkvwsf
This commit is contained in:
Fabien Meghazi 2014-04-10 20:27:23 +02:00
parent e1bf418856
commit 2b79294500
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
addons/web/controllers/main.py
View File

@ -595,8 +595,15 @@ class Home(http.Controller):
bundle.last_modified
if request.httprequest.if_modified_since and request.httprequest.if_modified_since >= bundle.last_modified:
return werkzeug.wrappers.Response(status=304)
headers = [('Content-Type', 'application/javascript')]
if True:
# WIP: decide best cache settings
headers.append(('Cache-Control', 'max-age=%s' % (60*5)))
return request.make_response(bundle.js(), headers)
return make_conditional(
request.make_response(bundle.js(), [('Content-Type', 'application/javascript')]),
request.make_response(bundle.js(), headers),
bundle.last_modified, bundle.checksum)
@http.route('/web/css/<xmlid>', type='http', auth='none')
@ -606,8 +613,15 @@ class Home(http.Controller):
bundle = AssetsBundle(xmlid, assets_html)
if request.httprequest.if_modified_since and request.httprequest.if_modified_since >= bundle.last_modified:
return werkzeug.wrappers.Response(status=304)
headers = [('Content-Type', 'text/css')]
if True:
# WIP: decide best cache settings
headers.append(('Cache-Control', 'max-age=%s' % (60*5)))
return request.make_response(bundle.css(), headers)
return make_conditional(
request.make_response(bundle.css(), [('Content-Type', 'text/css')]),
request.make_response(bundle.css(), headers),
bundle.last_modified, bundle.checksum)
class WebClient(http.Controller):