From 1af65e695d62353f647a7b21019dd91b8d542e3a Mon Sep 17 00:00:00 2001 From: strawberry Date: Thu, 30 May 2024 23:33:52 -0400 Subject: [PATCH] media: return application/octet-stream if no content-type was provided Signed-off-by: strawberry --- src/core/utils/content_disposition.rs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/core/utils/content_disposition.rs b/src/core/utils/content_disposition.rs index 8991c259..1eafcc4a 100644 --- a/src/core/utils/content_disposition.rs +++ b/src/core/utils/content_disposition.rs @@ -62,13 +62,13 @@ pub fn content_disposition_type(buf: &[u8], content_type: &Option) -> &' #[must_use] #[tracing::instrument(skip(buf))] pub fn make_content_type(buf: &[u8], content_type: &Option) -> &'static str { - let Some(file_type) = infer::get(buf) else { - debug_info!("Failed to infer the file's contents"); + let Some(claimed_content_type) = content_type else { return APPLICATION_OCTET_STREAM; }; - let Some(claimed_content_type) = content_type else { - return file_type.mime_type(); + let Some(file_type) = infer::get(buf) else { + debug_info!("Failed to infer the file's contents"); + return APPLICATION_OCTET_STREAM; }; if claimed_content_type.contains("svg") && file_type.mime_type().contains("xml") {