Only set headers for media

merge-requests/30/head
Bob Mottram 2021-09-26 17:05:36 +01:00
parent fbafaca666
commit b74f19ebbf
1 changed files with 13 additions and 8 deletions

View File

@ -715,8 +715,12 @@ class PubServer(BaseHTTPRequestHandler):
callingDomain: str, permissive: bool) -> None: callingDomain: str, permissive: bool) -> None:
self.send_response(200) self.send_response(200)
self.send_header('Content-type', fileFormat) self.send_header('Content-type', fileFormat)
cache_control = \ if 'image/' in fileFormat or 'video/' in fileFormat:
'max-age=84600, must-revalidate, stale-while-revalidate=3600' cache_control = \
'public, max-age=84600, must-revalidate, ' + \
'stale-while-revalidate=3600'
else:
cache_control = 'public'
self.send_header('Cache-Control', cache_control) self.send_header('Cache-Control', cache_control)
self.send_header('Origin', self.server.domainFull) self.send_header('Origin', self.server.domainFull)
self.send_header('APInstanceID', self.server.instanceId) self.send_header('APInstanceID', self.server.instanceId)
@ -727,12 +731,13 @@ class PubServer(BaseHTTPRequestHandler):
self.send_header('Host', callingDomain) self.send_header('Host', callingDomain)
if permissive: if permissive:
self.send_header('Access-Control-Allow-Origin', '*') self.send_header('Access-Control-Allow-Origin', '*')
acStr = \ if 'image/' in fileFormat or 'video/' in fileFormat:
'Server, x-goog-meta-frames, Content-Length, ' + \ acStr = \
'Content-Type, Range, X-Requested-With, ' + \ 'Server, x-goog-meta-frames, Content-Length, ' + \
'If-Modified-Since, If-None-Match' 'Content-Type, Range, X-Requested-With, ' + \
self.send_header('Access-Control-Allow-Headers', acStr) 'If-Modified-Since, If-None-Match'
self.send_header('Access-Control-Expose-Headers', acStr) self.send_header('Access-Control-Allow-Headers', acStr)
self.send_header('Access-Control-Expose-Headers', acStr)
return return
if cookie: if cookie:
cookieStr = cookie cookieStr = cookie