From db2469f109880eca17c2a6d5a085dbebb384d747 Mon Sep 17 00:00:00 2001 From: mdipierro Date: Thu, 29 Aug 2013 21:32:36 -0500 Subject: [PATCH] fixed issue 1448, headers in wiki media files, sorry Nico this fell under the radar and tool way longer than should have --- VERSION | 2 +- gluon/tools.py | 12 ++++++++++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/VERSION b/VERSION index 60efd36c..46c0f5e5 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 2.6.0-development+timestamp.2013.08.29.21.15.25 +Version 2.6.0-development+timestamp.2013.08.29.21.31.47 diff --git a/gluon/tools.py b/gluon/tools.py index a717e5a6..11f02c5e 100644 --- a/gluon/tools.py +++ b/gluon/tools.py @@ -5629,7 +5629,7 @@ class Wiki(object): return dict(content=content) def media(self, id): - request, db = current.request, self.auth.db + request, response, db = current.request, current.response, self.auth.db media = db.wiki_media(id) if media: if self.settings.manage_permissions: @@ -5637,7 +5637,15 @@ class Wiki(object): if not self.can_read(page): return self.not_authorized(page) request.args = [media.filename] - return current.response.download(request, db) + m = response.download(request, db) + current.session.forget() # get rid of the cookie + response.headers['Last-Modified'] = \ + request.utcnow.strftime("%a, %d %b %Y %H:%M:%S GMT") + if 'Content-Disposition' in response.headers: + del response.headers['Content-Disposition'] + response.headers['Pragma'] = 'cache' + response.headers['Cache-Control'] = 'private' + return m else: raise HTTP(404)