paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-04 05:53:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

s3: Stop setting empty Content-Disposition header.

Browse Source
This commit is contained in:
Alex Vandiver
2024-06-28 23:44:30 +00:00
committed by Tim Abbott
parent 54be4443ae
commit 6258817bfd
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
zerver/lib/upload/s3.py
View File

@@ -81,18 +81,18 @@ def upload_image_to_s3(
"realm_id": str(user_profile.realm_id), "realm_id": str(user_profile.realm_id),
} }
content_disposition = "" extras = {}
if content_type is None: if content_type is None:
content_type = "" content_type = ""
if content_type not in INLINE_MIME_TYPES: if content_type not in INLINE_MIME_TYPES:
content_disposition = "attachment" extras["ContentDisposition"] = "attachment"
key.put( key.put(
Body=contents, Body=contents,
Metadata=metadata, Metadata=metadata,
ContentType=content_type, ContentType=content_type,
ContentDisposition=content_disposition,
StorageClass=storage_class, StorageClass=storage_class,
**extras, # type: ignore[arg-type] # The dynamic kwargs here confuse mypy.
) )