mj-saunders
/
epicyon
forked from indymedia/epicyon
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Variable names

main
Bob Mottram 2020-05-29 13:39:49 +01:00
parent f796764a88
commit 01ded187b1
1 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
daemon.py
View File

@ -1818,35 +1818,35 @@ class PubServer(BaseHTTPRequestHandler):
# favicon image # favicon image
if '/favicon.ico' in self.path: if '/favicon.ico' in self.path:
# custom favicon # custom favicon
mediaFilename = \ faviconFilename = \
self.server.baseDir + '/favicon.ico' self.server.baseDir + '/favicon.ico'
if not os.path.isfile(mediaFilename): if not os.path.isfile(faviconFilename):
# default favicon # default favicon
mediaFilename = \ faviconFilename = \
self.server.baseDir + '/img/icons/favicon.ico' self.server.baseDir + '/img/icons/favicon.ico'
if self._etag_exists(mediaFilename): if self._etag_exists(faviconFilename):
# The file has not changed # The file has not changed
self._304() self._304()
return return
if self.server.iconsCache.get('favicon.ico'): if self.server.iconsCache.get('favicon.ico'):
mediaBinary = self.server.iconsCache['favicon.ico'] favBinary = self.server.iconsCache['favicon.ico']
self._set_headers_etag(mediaFilename, self._set_headers_etag(faviconFilename,
'image/png', 'image/png',
mediaBinary, cookie, favBinary, cookie,
callingDomain) callingDomain)
self._write(mediaBinary) self._write(favBinary)
return return
else: else:
if os.path.isfile(mediaFilename): if os.path.isfile(faviconFilename):
with open(mediaFilename, 'rb') as avFile: with open(faviconFilename, 'rb') as favFile:
mediaBinary = avFile.read() favBinary = favFile.read()
self._set_headers_etag(mediaFilename, self._set_headers_etag(faviconFilename,
'image/png', 'image/png',
mediaBinary, cookie, favBinary, cookie,
callingDomain) callingDomain)
self._write(mediaBinary) self._write(favBinary)
self.server.iconsCache['favicon.ico'] = mediaBinary self.server.iconsCache['favicon.ico'] = favBinary
return return
self._404() self._404()
return return