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

Unquote

main
Bob Mottram 2021-12-16 22:13:12 +00:00
parent 0a86daeccb
commit 192ebebe9e
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
daemon.py
View File

@ -7411,7 +7411,8 @@ class PubServer(BaseHTTPRequestHandler):
baseDir: str, GETstartTime) -> None: baseDir: str, GETstartTime) -> None:
"""Shows a favicon image obtained from the cache """Shows a favicon image obtained from the cache
""" """
mediaFilename = baseDir + path mediaFilename = baseDir + urllib.parse.unquote_plus(path)
print('showCachedFavicon: ' + showCachedFavicon)
if os.path.isfile(mediaFilename): if os.path.isfile(mediaFilename):
if self._etag_exists(mediaFilename): if self._etag_exists(mediaFilename):
# The file has not changed # The file has not changed
@ -13678,6 +13679,14 @@ class PubServer(BaseHTTPRequestHandler):
'_GET', 'hasAccept', '_GET', 'hasAccept',
self.server.debug) self.server.debug)
# cached favicon images
# Note that this comes before the busy flag to avoid conflicts
if htmlGET and self.path.startswith('/favicons/'):
self._showCachedFavicon(refererDomain, self.path,
self.server.baseDir,
GETstartTime)
return
# get css # get css
# Note that this comes before the busy flag to avoid conflicts # Note that this comes before the busy flag to avoid conflicts
if self.path.endswith('.css'): if self.path.endswith('.css'):
@ -14048,14 +14057,6 @@ class PubServer(BaseHTTPRequestHandler):
'_GET', 'registered devices done', '_GET', 'registered devices done',
self.server.debug) self.server.debug)
# cached favicon images
# Note that this comes before the busy flag to avoid conflicts
if self.path.startswith('/favicons/'):
self._showCachedFavicon(refererDomain, self.path,
self.server.baseDir,
GETstartTime)
return
if htmlGET and usersInPath: if htmlGET and usersInPath:
# show the person options screen with view/follow/block/report # show the person options screen with view/follow/block/report
if '?options=' in self.path: if '?options=' in self.path: