Changeset 151793 in webkit

Timestamp:

Jun 20, 2013 1:06:02 PM (11 years ago)

Author:

ap@apple.com

Message:

[Mac] Downloaded file name encoding is incorrect when download link opens in a new window
​https://bugs.webkit.org/show_bug.cgi?id=117818
<rdar://problem/14212635>

Reviewed by Brady Eidson.

No tests added. The machinery we have for logging downloaded file name is very
far from being able to work in a secondary window.

• loader/FrameLoader.cpp: (WebCore::FrameLoader::addExtraFieldsToRequest): Made a targeted fix - don't update encoding fallback array if we already have one, there is no chance for it to be more correct. In this case, it's incorrect because it comes from a new blank window, instead of original referer. We have a lot of code in addExtraFieldsToRequest() to struggle with this, and we have a FIXME to try not calling it from policy delegate.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• loader/FrameLoader.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-06-20  Alexey Proskuryakov  <ap@apple.com>
+
+        [Mac] Downloaded file name encoding is incorrect when download link opens in a new window
+        https://bugs.webkit.org/show_bug.cgi?id=117818
+        <rdar://problem/14212635>
+
+        Reviewed by Brady Eidson.
+
+        No tests added. The machinery we have for logging downloaded file name is very
+        far from being able to work in a secondary window.
+
+        * loader/FrameLoader.cpp: (WebCore::FrameLoader::addExtraFieldsToRequest):
+        Made a targeted fix - don't update encoding fallback array if we already have one,
+        there is no chance for it to be more correct. In this case, it's incorrect because
+        it comes from a new blank window, instead of original referer.
+        We have a lot of code in addExtraFieldsToRequest() to struggle with this, and we have
+        a FIXME to try not calling it from policy delegate.
+
 2013-06-18  Robert Hogan  <robert@webkit.org>
 

trunk/Source/WebCore/loader/FrameLoader.cpp

@@ -2501 +2501 @@
     addHTTPOriginIfNeeded(request, String());
 
-    // Always try UTF-8. If that fails, try frame encoding (if any) and then the default.
-    Settings* settings = m_frame->settings();
-    request.setResponseContentDispositionEncodingFallbackArray("UTF-8", m_frame->document()->encoding(), settings ? settings->defaultTextEncodingName() : String());
+    // Only set fallback array if it's still empty (later attempts may be incorrect, see bug 117818).
+    if (request.responseContentDispositionEncodingFallbackArray().isEmpty()) {
+        // Always try UTF-8. If that fails, try frame encoding (if any) and then the default.
+        Settings* settings = m_frame->settings();
+        request.setResponseContentDispositionEncodingFallbackArray("UTF-8", m_frame->document()->encoding(), settings ? settings->defaultTextEncodingName() : String());
+    }
 }