indymedia
/
epicyon
mirror of https://gitlab.com/bashrc2/epicyon
7
4
Fork 1
Code Issues 14 Releases Wiki Activity

Etags on background images

merge-requests/30/head
Bob Mottram 2020-04-13 21:59:56 +01:00
parent 94bb081428
commit 073444c55a
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
daemon.py
View File

@ -1772,6 +1772,10 @@ class PubServer(BaseHTTPRequestHandler):
avatarNickname + '@' + \ avatarNickname + '@' + \
self.server.domain + '/' + avatarFile self.server.domain + '/' + avatarFile
if os.path.isfile(avatarFilename): if os.path.isfile(avatarFilename):
if self._etag_exists(avatarFilename):
# The file has not changed
self._304()
return
mediaImageType = 'png' mediaImageType = 'png'
if avatarFile.endswith('.png'): if avatarFile.endswith('.png'):
mediaImageType = 'png' mediaImageType = 'png'
@ -1783,8 +1787,9 @@ class PubServer(BaseHTTPRequestHandler):
mediaImageType = 'webp' mediaImageType = 'webp'
with open(avatarFilename, 'rb') as avFile: with open(avatarFilename, 'rb') as avFile:
mediaBinary = avFile.read() mediaBinary = avFile.read()
self._set_headers('image/' + mediaImageType, self._set_headers_etag(avatarFilename,
len(mediaBinary), cookie, 'image/' + mediaImageType,
mediaBinary, cookie,
callingDomain) callingDomain)
self._write(mediaBinary) self._write(mediaBinary)
return return