summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristophe Simonis <chs@odoo.com>2017-10-18 14:57:25 +0200
committerChristophe Simonis <chs@odoo.com>2017-10-18 14:57:25 +0200
commit00a14fd83235af92e9c0b860bd2ae90a2f09d4fe (patch)
tree19a5655bebc4ad2bd44069e344335c53d9b755be
parenta01e76efa71d4db2fa9de0095d13bdfc359f91f0 (diff)
parent2d46dbcbfd122eaf1686623cf8cf319178e31109 (diff)
[MERGE] forward port branch 10.0 up to 2d46dbcbfd1
-rw-r--r--odoo/addons/base/ir/ir_http.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/odoo/addons/base/ir/ir_http.py b/odoo/addons/base/ir/ir_http.py
index 1d942e75a86..df15e45df22 100644
--- a/odoo/addons/base/ir/ir_http.py
+++ b/odoo/addons/base/ir/ir_http.py
@@ -324,7 +324,7 @@ class IrHttp(models.AbstractModel):
# cache
etag = hasattr(request, 'httprequest') and request.httprequest.headers.get('If-None-Match')
- retag = '"%s"' % hashlib.md5(last_update).hexdigest()
+ retag = '"%s"' % hashlib.md5(content).hexdigest()
status = status or (304 if etag == retag else 200)
headers.append(('ETag', retag))
headers.append(('Cache-Control', 'max-age=%s' % (STATIC_CACHE if unique else 0)))