vaadin
diff --git a/‎flow-server/src/main/java/com/vaadin/flow/server/VaadinResponse.java
Lines changed: 10 additions & 0 deletions b/‎flow-server/src/main/java/com/vaadin/flow/server/VaadinResponse.java
Lines changed: 10 additions & 0 deletions
diff --git a/‎flow-server/src/main/java/com/vaadin/flow/server/streams/FileDownloadHandler.java
Lines changed: 1 addition & 1 deletion b/‎flow-server/src/main/java/com/vaadin/flow/server/streams/FileDownloadHandler.java
Lines changed: 1 addition & 1 deletion
diff --git a/‎flow-server/src/test/java/com/vaadin/flow/server/streams/FileDownloadHandlerTest.java
Lines changed: 7 additions & 3 deletions b/‎flow-server/src/test/java/com/vaadin/flow/server/streams/FileDownloadHandlerTest.java
Lines changed: 7 additions & 3 deletions
@@ -171,6 +171,16 @@ public interface VaadinResponse {
      */
     void setContentLength(int len);
 
+    /**
+     * Sets the length of the content body in the response In HTTP servlets,
+     * this method sets the HTTP Content-Length header.
+     *
+     * @param len
+     *            a long specifying the length of the content being returned to
+     *            the client
+     */
+    void setContentLengthLong(long len);
+
     /**
      * Sets all conceivable headers that might prevent a response from being
      * stored in any caches.
 
@@ -75,7 +75,7 @@ public void handleDownloadRequest(DownloadEvent downloadEvent) {
             throw new UncheckedIOException(ioe);
         }
         response.setContentType(downloadEvent.getContentType());
-        response.setContentLength(Math.toIntExact(file.length()));
+        response.setContentLengthLong(file.length());
     }
 
     @Override
 
@@ -38,6 +38,7 @@
 import com.vaadin.flow.server.VaadinRequest;
 import com.vaadin.flow.server.VaadinResponse;
 import com.vaadin.flow.server.VaadinSession;
+import com.vaadin.flow.server.frontend.FrontendUtils;
 
 public class FileDownloadHandlerTest {
 
@@ -127,7 +128,7 @@ public void onError(TransferContext context,
                 transferredBytesRecords.stream().mapToLong(Long::longValue)
                         .toArray());
         Mockito.verify(response).setContentType("application/octet-stream");
-        Mockito.verify(response).setContentLength(165000);
+        Mockito.verify(response).setContentLengthLong(165000);
     }
 
     @Test
@@ -158,8 +159,11 @@ public void onComplete(TransferContext context,
                     public void onError(TransferContext context,
                             IOException reason) {
                         invocations.add("onError");
-                        Assert.assertEquals(
-                                "non-existing-file (No such file or directory)",
+                        String expectedMessage = "non-existing-file (No such file or directory)";
+                        if (FrontendUtils.isWindows()) {
+                            expectedMessage = "non-existing-file (The system cannot find the file specified)";
+                        }
+                        Assert.assertEquals(expectedMessage,
                                 reason.getMessage());
                     }
                 });
Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,7 @@ public void handleDownloadRequest(DownloadEvent downloadEvent) {`
`75`	`75`	`throw new UncheckedIOException(ioe);`
`76`	`76`	`}`
`77`	`77`	`response.setContentType(downloadEvent.getContentType());`
`78`		`- response.setContentLength(Math.toIntExact(file.length()));`
	`78`	`+ response.setContentLengthLong(file.length());`
`79`	`79`	`}`
`80`	`80`
`81`	`81`	`@Override`