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

Don't send 304s for avatars or media

merge-requests/30/head
Bob Mottram 2021-09-26 15:13:28 +01:00
parent 5211451693
commit bf433e34f0
1 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
daemon.py
View File

@ -6486,10 +6486,11 @@ class PubServer(BaseHTTPRequestHandler):
mediaStr = path.split('/media/')[1] mediaStr = path.split('/media/')[1]
mediaFilename = baseDir + '/media/' + mediaStr mediaFilename = baseDir + '/media/' + mediaStr
if os.path.isfile(mediaFilename): if os.path.isfile(mediaFilename):
if self._etag_exists(mediaFilename): # TEST
# The file has not changed #if self._etag_exists(mediaFilename):
self._304() # # The file has not changed
return # self._304()
# return
mediaFileType = mediaFileMimeType(mediaFilename) mediaFileType = mediaFileMimeType(mediaFilename)
@ -6685,10 +6686,11 @@ class PubServer(BaseHTTPRequestHandler):
""" """
mediaFilename = baseDir + '/cache' + path mediaFilename = baseDir + '/cache' + path
if os.path.isfile(mediaFilename): if os.path.isfile(mediaFilename):
if self._etag_exists(mediaFilename): # TEST
# The file has not changed # if self._etag_exists(mediaFilename):
self._304() # # The file has not changed
return # self._304()
# return
with open(mediaFilename, 'rb') as avFile: with open(mediaFilename, 'rb') as avFile:
mediaBinary = avFile.read() mediaBinary = avFile.read()
mimeType = mediaFileMimeType(mediaFilename) mimeType = mediaFileMimeType(mediaFilename)
@ -11367,10 +11369,11 @@ class PubServer(BaseHTTPRequestHandler):
acctDir(baseDir, avatarNickname, domain) + '/' + avatarFile acctDir(baseDir, avatarNickname, domain) + '/' + avatarFile
if not os.path.isfile(avatarFilename): if not os.path.isfile(avatarFilename):
return False return False
if self._etag_exists(avatarFilename): # TEST
# The file has not changed # if self._etag_exists(avatarFilename):
self._304() # # The file has not changed
return True # self._304()
# return True
t = os.path.getmtime(avatarFilename) t = os.path.getmtime(avatarFilename)
lastModifiedTime = datetime.datetime.fromtimestamp(t) lastModifiedTime = datetime.datetime.fromtimestamp(t)