Merge branch 'develop' into final-2.3

This commit is contained in:
Micah Lee 2021-02-21 10:34:03 -08:00
commit fbf1091bb8
No known key found for this signature in database
GPG key ID: 403C2657CD994F73
24 changed files with 638 additions and 135 deletions

View file

@ -200,10 +200,10 @@ class ShareModeWeb(SendBaseModeWeb):
r.headers.set("Content-Encoding", "gzip")
r.headers.set("Content-Length", self.filesize)
filename_dict = {
'filename': unidecode(basename),
'filename*': "UTF-8''%s" % url_quote(basename)
"filename": unidecode(basename),
"filename*": "UTF-8''%s" % url_quote(basename),
}
r.headers.set("Content-Disposition", "inline", **filename_dict)
r.headers.set("Content-Disposition", "attachment", **filename_dict)
r = self.web.add_security_headers(r)
# guess content type
(content_type, _) = mimetypes.guess_type(basename, strict=False)