Revert "Encode filenames to UTF-8 in Content-Disposition header. (#16…

…556)" Breaks AppResource404, BrowserFrameIsVisible and FlashIsVisible This reverts commit af6dd56. Change-Id: I82fc9ef4c9d08dc8aa48e0fa137fae5782701389
vaadin · Mar 6, 2015 · 21329bc · 21329bc
1 parent 14db3f8
commit 21329bc
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 61 deletions.
diff --git a/server/src/com/vaadin/server/DownloadStream.java b/server/src/com/vaadin/server/DownloadStream.java
@@ -20,8 +20,6 @@
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.io.Serializable;
-import java.io.UnsupportedEncodingException;
-import java.net.URLEncoder;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
@@ -282,9 +280,16 @@ public void writeResponse(VaadinRequest request, VaadinResponse response)
                     }
                 }
 
-                // Content-Disposition: attachment generally forces download
-                response.setHeader("Content-Disposition",
-                        getContentDispositionValue());
+                // suggest local filename from DownloadStream if
+                // Content-Disposition
+                // not explicitly set
+                String contentDispositionValue = getParameter("Content-Disposition");
+                if (contentDispositionValue == null) {
+                    contentDispositionValue = "filename=\"" + getFileName()
+                            + "\"";
+                    response.setHeader("Content-Disposition",
+                            contentDispositionValue);
+                }
 
                 int bufferSize = getBufferSize();
                 if (bufferSize <= 0 || bufferSize > Constants.MAX_BUFFER_SIZE) {
@@ -312,21 +317,6 @@ public void writeResponse(VaadinRequest request, VaadinResponse response)
         }
     }
 
-    private String getContentDispositionValue()
-            throws UnsupportedEncodingException {
-        String contentDispositionValue = getParameter("Content-Disposition");
-
-        if (contentDispositionValue == null) {
-            String encodedFilename = URLEncoder.encode(getFileName(), "utf-8");
-
-            contentDispositionValue = String.format(
-                    "attachment; filename=\"%s\"; filename*=utf-8''%s",
-                    encodedFilename, encodedFilename);
-        }
-
-        return contentDispositionValue;
-    }
-
     /**
      * Helper method that tries to close an output stream and ignores any
      * exceptions.

diff --git a/server/src/com/vaadin/server/FileDownloader.java b/server/src/com/vaadin/server/FileDownloader.java
@@ -141,6 +141,12 @@ public boolean handleConnectorRequest(VaadinRequest request,
             }
             stream = ((ConnectorResource) resource).getStream();
 
+            if (stream.getParameter("Content-Disposition") == null) {
+                // Content-Disposition: attachment generally forces download
+                stream.setParameter("Content-Disposition",
+                        "attachment; filename=\"" + stream.getFileName() + "\"");
+            }
+
             // Content-Type to block eager browser plug-ins from hijacking
             // the file
             if (isOverrideContentType()) {

diff --git a/server/tests/src/com/vaadin/server/FileDownloaderTests.java b/server/tests/src/com/vaadin/server/FileDownloaderTests.java