diff options
Diffstat (limited to 'addons/web/controllers/main.py')
| -rw-r--r-- | addons/web/controllers/main.py | 23 |
1 files changed, 19 insertions, 4 deletions
diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py index 8203efc969e..2966b34ab19 100644 --- a/addons/web/controllers/main.py +++ b/addons/web/controllers/main.py @@ -1331,19 +1331,34 @@ class Binary(openerpweb.Controller): @openerpweb.httprequest def image(self, req, model, id, field, **kw): + last_update = '__last_update' Model = req.session.model(model) context = req.session.eval_context(req.context) + headers = [('Content-Type', 'image/png')] + etag = req.httprequest.headers.get('If-None-Match') + hashed_session = hashlib.md5(req.session_id).hexdigest() + if etag: + if not id and hashed_session == etag: + return werkzeug.wrappers.Response(status=304) + else: + date = Model.read([int(id)], [last_update], context)[0].get(last_update) + if hashlib.md5(date).hexdigest() == etag: + return werkzeug.wrappers.Response(status=304) + retag = hashed_session try: if not id: res = Model.default_get([field], context).get(field) + image_data = base64.b64decode(res) else: - res = Model.read([int(id)], [field], context)[0].get(field) - image_data = base64.b64decode(res) + res = Model.read([int(id)], [last_update, field], context)[0] + retag = hashlib.md5(res.get(last_update)).hexdigest() + image_data = base64.b64decode(res.get(field)) except (TypeError, xmlrpclib.Fault): image_data = self.placeholder(req) - return req.make_response(image_data, [ - ('Content-Type', 'image/png'), ('Content-Length', len(image_data))]) + headers.append(('ETag', retag)) + headers.append(('Content-Length', len(image_data))) + return req.make_response(image_data, headers) def placeholder(self, req): addons_path = openerpweb.addons_manifest['web']['addons_path'] return open(os.path.join(addons_path, 'web', 'static', 'src', 'img', 'placeholder.png'), 'rb').read() |