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

Set host on avatar image

merge-requests/30/head
Bob Mottram 2021-01-21 19:07:10 +00:00
parent 6d80435df4
commit 42a3337f36
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
daemon.py
View File

@ -221,7 +221,6 @@ from media import removeMetaData
from cache import storePersonInCache from cache import storePersonInCache
from cache import getPersonFromCache from cache import getPersonFromCache
from httpsig import verifyPostHeaders from httpsig import verifyPostHeaders
from httpsig import createSignedHeader
from theme import setNewsAvatar from theme import setNewsAvatar
from theme import setTheme from theme import setTheme
from theme import getTheme from theme import getTheme
@ -9382,7 +9381,7 @@ class PubServer(BaseHTTPRequestHandler):
self._set_headers_etag(bgFilename, self._set_headers_etag(bgFilename,
'image/' + ext, 'image/' + ext,
bgBinary, None, bgBinary, None,
callingDomain) self.server.domainFull)
self._write(bgBinary) self._write(bgBinary)
self._benchmarkGETtimings(GETstartTime, self._benchmarkGETtimings(GETstartTime,
GETtimings, GETtimings,
@ -9486,7 +9485,7 @@ class PubServer(BaseHTTPRequestHandler):
self._set_headers_etag(avatarFilename, self._set_headers_etag(avatarFilename,
'image/' + mediaImageType, 'image/' + mediaImageType,
mediaBinary, None, mediaBinary, None,
callingDomain) self.server.domainFull)
self._write(mediaBinary) self._write(mediaBinary)
self._benchmarkGETtimings(GETstartTime, GETtimings, self._benchmarkGETtimings(GETstartTime, GETtimings,
'icon shown done', 'icon shown done',
@ -9761,7 +9760,7 @@ class PubServer(BaseHTTPRequestHandler):
# if an image is received # if an image is received
if self.headers.get('Accept'): if self.headers.get('Accept'):
if 'image' in self.headers['Accept']: if 'image' in self.headers['Accept']:
print('image GET header: ' + str(self.headers).replace('\n', ', ')) print('image GET header: ' + str(self.headers['Accept']))
callingDomain = self.server.domainFull callingDomain = self.server.domainFull
if self.headers.get('Host'): if self.headers.get('Host'):
@ -10581,7 +10580,7 @@ class PubServer(BaseHTTPRequestHandler):
# cached avatar images # cached avatar images
# 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.startswith('/avatars/'): if self.path.startswith('/avatars/'):
self._showCachedAvatar(callingDomain, self.path, self._showCachedAvatar(self.server.domainFull, self.path,
self.server.baseDir, self.server.baseDir,
GETstartTime, GETtimings) GETstartTime, GETtimings)
return return