From a2b98289b2eefaa8acccfe7463cc86aae52c3f32 Mon Sep 17 00:00:00 2001
From: Oliver Blanthorn <freedom4cows@gmail.com>
Date: Thu, 23 Jul 2026 08:10:56 +0200
Subject: [PATCH] Fix #1091: use content-disposition for downloads

---
 src/background/download_background.ts | 29 ++++++++++++++++++++++++++-
 1 file changed, 28 insertions(+), 1 deletion(-)

diff --git a/src/background/download_background.ts b/src/background/download_background.ts
index b1f72a0e..17e0fe0d 100644
--- a/src/background/download_background.ts
+++ b/src/background/download_background.ts
@@ -50,7 +50,34 @@ export async function downloadUrl(url: string, saveAs: boolean) {
         urlToDownload = urlToSave.href
     }
 
-    const fileName = getDownloadFilenameForUrl(urlToSave)
+    let fileName = getDownloadFilenameForUrl(urlToSave)
+    if (urlToSave.protocol === "http:" || urlToSave.protocol === "https:") {
+        const controller = new AbortController()
+        const timeout = setTimeout(() => controller.abort(), 5000)
+        try {
+            const response = await fetch(urlToSave.href, {
+                method: "HEAD",
+                credentials: "omit",
+                signal: controller.signal,
+            })
+            const disposition =
+                response.ok && response.headers.get("content-disposition")
+            const match = /(?:^|;)\s*filename\s*=\s*"?([^";]+)"?/i.exec(
+                disposition || "",
+            )
+            const basename = match?.[1].trim().replace(
+                /^.*[\\/][. ]*|^[. ]+|[<>:"|?*\p{Cc}]|[. ]+$/gu,
+                "_",
+            )
+            if (basename)
+                fileName = /^(con|prn|aux|nul|com[1-9]|lpt[1-9])(?:\.|$)/i.test(
+                    basename,
+                )
+                    ? `_${basename}`
+                    : basename
+        } catch {}
+        clearTimeout(timeout)
+    }
 
     // Save location limitations:
     //  - download() can't save outside the downloads dir without popping