indymedia
/
epicyon
mirror of https://gitlab.com/bashrc2/epicyon
7
4
Fork 1
Code Issues 14 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
if '/favicon.ico' in self.path:
# custom favicon
mediaFilename = \
faviconFilename = \
self.server.baseDir + '/favicon.ico'
if not os.path.isfile(mediaFilename):
if not os.path.isfile(faviconFilename):
# default favicon
mediaFilename = \
faviconFilename = \
self.server.baseDir + '/img/icons/favicon.ico'
if self._etag_exists(mediaFilename):
if self._etag_exists(faviconFilename):
# The file has not changed
self._304()
return
if self.server.iconsCache.get('favicon.ico'):
mediaBinary = self.server.iconsCache['favicon.ico']
self._set_headers_etag(mediaFilename,
favBinary = self.server.iconsCache['favicon.ico']
self._set_headers_etag(faviconFilename,
'image/png',
mediaBinary, cookie,
favBinary, cookie,
callingDomain)
self._write(mediaBinary)
self._write(favBinary)
return
else:
if os.path.isfile(mediaFilename):
with open(mediaFilename, 'rb') as avFile:
mediaBinary = avFile.read()
self._set_headers_etag(mediaFilename,
if os.path.isfile(faviconFilename):
with open(faviconFilename, 'rb') as favFile:
favBinary = favFile.read()
self._set_headers_etag(faviconFilename,
'image/png',
mediaBinary, cookie,
favBinary, cookie,
callingDomain)
self._write(mediaBinary)
self.server.iconsCache['favicon.ico'] = mediaBinary
return
self._write(favBinary)
self.server.iconsCache['favicon.ico'] = favBinary
return
self._404()
return