Merge branch 'main' into SITES-26450

adobe · Feb 21, 2025 · 53551fe · 53551fe
2 parents 68bdb43 + 64acead
commit 53551fe
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/...ore/src/main/java/com/adobe/cq/wcm/core/components/internal/servlets/DownloadServlet.java b/...ore/src/main/java/com/adobe/cq/wcm/core/components/internal/servlets/DownloadServlet.java
@@ -191,7 +191,7 @@ private void sendResponse(InputStream stream, long size, String mimeType, String
             response.setContentLength((int) size);
         }
         if (inline) {
-            response.setHeader(CONTENT_DISPOSITION_HEADER, "inline");
+            response.setHeader(CONTENT_DISPOSITION_HEADER, "inline; filename=\"" + filename + "\"");
             response.setHeader(CSP_HEADER, "sandbox");
         } else {
             response.setHeader(CONTENT_DISPOSITION_HEADER, "attachment; filename=\"" + filename + "\"");

diff --git a/...src/test/java/com/adobe/cq/wcm/core/components/internal/servlets/DownloadServletTest.java b/...src/test/java/com/adobe/cq/wcm/core/components/internal/servlets/DownloadServletTest.java
@@ -85,7 +85,7 @@ void testInlineAssetDownload() throws Exception {
         context.requestPathInfo().setExtension("pdf");
         downloadServlet.doGet(context.request(), context.response());
         assertTrue(context.response().containsHeader("Content-Disposition"));
-        assertEquals("inline", context.response().getHeader("Content-Disposition"));
+        assertEquals("inline; filename=\"Download_Test_PDF.pdf\"", context.response().getHeader("Content-Disposition"));
         assertTrue(context.response().containsHeader("Content-Security-Policy"));
         assertEquals("sandbox", context.response().getHeader("Content-Security-Policy"));
         assertEquals(8192, context.response().getBufferSize());