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

No longer testing

merge-requests/30/head
Bob Mottram 2021-10-01 10:11:01 +01:00
parent 8661d2594d
commit a439d2c6d7
1 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
daemon.py
View File

@ -6490,11 +6490,10 @@ 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):
# TEST if self._etag_exists(mediaFilename):
# if self._etag_exists(mediaFilename): # The file has not changed
# # The file has not changed self._304()
# self._304() return
# return
mediaFileType = mediaFileMimeType(mediaFilename) mediaFileType = mediaFileMimeType(mediaFilename)
@ -6690,11 +6689,10 @@ class PubServer(BaseHTTPRequestHandler):
""" """
mediaFilename = baseDir + '/cache' + path mediaFilename = baseDir + '/cache' + path
if os.path.isfile(mediaFilename): if os.path.isfile(mediaFilename):
# TEST if self._etag_exists(mediaFilename):
# if self._etag_exists(mediaFilename): # The file has not changed
# # The file has not changed self._304()
# self._304() return
# 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)
@ -11397,11 +11395,10 @@ 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
# TEST if self._etag_exists(avatarFilename):
# if self._etag_exists(avatarFilename): # The file has not changed
# # The file has not changed self._304()
# self._304() return True
# return True
t = os.path.getmtime(avatarFilename) t = os.path.getmtime(avatarFilename)
lastModifiedTime = datetime.datetime.fromtimestamp(t) lastModifiedTime = datetime.datetime.fromtimestamp(t)