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

Earlier favicon access

main
Bob Mottram 2020-05-29 20:21:08 +01:00
parent e8c76ab651
commit 727c032059
1 changed files with 36 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
daemon.py
View File

@ -1105,6 +1105,42 @@ class PubServer(BaseHTTPRequestHandler):
self._benchmarkGETtimings(GETstartTime, GETtimings, 4)
# favicon image
if 'favicon.ico' in self.path:
favFilename = 'favicon.ico'
# custom favicon
faviconFilename = \
self.server.baseDir + '/' + favFilename
if not os.path.isfile(faviconFilename):
# default favicon
faviconFilename = \
self.server.baseDir + '/img/icons/' + favFilename
if self._etag_exists(faviconFilename):
# The file has not changed
self._304()
return
if self.server.iconsCache.get(favFilename):
favBinary = self.server.iconsCache[favFilename]
self._set_headers_etag(faviconFilename,
'image/x-icon',
favBinary, cookie,
callingDomain)
self._write(favBinary)
return
else:
if os.path.isfile(faviconFilename):
with open(faviconFilename, 'rb') as favFile:
favBinary = favFile.read()
self._set_headers_etag(faviconFilename,
'image/x-icon',
favBinary, cookie,
callingDomain)
self._write(favBinary)
self.server.iconsCache[favFilename] = favBinary
return
self._404()
return
# check authorization
authorized = self._isAuthorized()
if self.server.debug:
@ -1142,42 +1178,6 @@ class PubServer(BaseHTTPRequestHandler):
self._400()
return
# favicon image
if 'favicon.ico' in self.path:
favFilename = 'favicon.ico'
# custom favicon
faviconFilename = \
self.server.baseDir + '/' + favFilename
if not os.path.isfile(faviconFilename):
# default favicon
faviconFilename = \
self.server.baseDir + '/img/icons/' + favFilename
if self._etag_exists(faviconFilename):
# The file has not changed
self._304()
return
if self.server.iconsCache.get(favFilename):
favBinary = self.server.iconsCache[favFilename]
self._set_headers_etag(faviconFilename,
'image/x-icon',
favBinary, cookie,
callingDomain)
self._write(favBinary)
return
else:
if os.path.isfile(faviconFilename):
with open(faviconFilename, 'rb') as favFile:
favBinary = favFile.read()
self._set_headers_etag(faviconFilename,
'image/x-icon',
favBinary, cookie,
callingDomain)
self._write(favBinary)
self.server.iconsCache[favFilename] = favBinary
return
self._404()
return
# get fonts
if htmlGET and '/fonts/' in self.path:
fontStr = self.path.split('/fonts/')[1]