Changeset 84976 in webkit

Timestamp:

Apr 26, 2011 4:26:07 PM (13 years ago)

Author:

Patrick Gansterer

Message:

2011-04-26 Patrick Gansterer <Patrick Gansterer>

Reviewed by Adam Barth.

Respect charset in handleDataURL
​https://bugs.webkit.org/show_bug.cgi?id=47746

Original patch by Kwang Yul Seo <​skyul@company100.net>

We must use TextEncoding(charset) to encode data URL again. Otherwise TextEncoding::encode()
returns an empty string because encoding name is not specified.

Also use "US-ASCII" as fallback charset as extractCharsetFromMediaType can be empty.

This change fixes over 130 layout tests when running GTK port with cURL network backend.

• platform/network/DataURL.cpp: (WebCore::handleDataURL):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/network/DataURL.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-04-26  Patrick Gansterer  <paroga@webkit.org>
+
+        Reviewed by Adam Barth.
+
+        Respect charset in handleDataURL
+        https://bugs.webkit.org/show_bug.cgi?id=47746
+
+        Original patch by Kwang Yul Seo <skyul@company100.net>
+
+        We must use TextEncoding(charset) to encode data URL again. Otherwise TextEncoding::encode()
+        returns an empty string because encoding name is not specified.
+
+        Also use "US-ASCII" as fallback charset as extractCharsetFromMediaType can be empty.
+
+        This change fixes over 130 layout tests when running GTK port with cURL network backend.
+
+        * platform/network/DataURL.cpp:
+        (WebCore::handleDataURL):
+
 2011-04-26  Anders Carlsson  <andersca@apple.com>
 

trunk/Source/WebCore/platform/network/DataURL.cpp

@@ -58 +58 @@
 
     if (mediaType.isEmpty())
-        mediaType = "text/plain;charset=US-ASCII";
+        mediaType = "text/plain";
 
     String mimeType = extractMIMETypeFromMediaType(mediaType);
     String charset = extractCharsetFromMediaType(mediaType);
+
+    if (charset.isEmpty())
+        charset = "US-ASCII";
 
     ResourceResponse response;
@@ -78 +81 @@
         }
     } else {
-        data = decodeURLEscapeSequences(data, TextEncoding(charset));
+        TextEncoding encoding(charset);
+        data = decodeURLEscapeSequences(data, encoding);
         handle->client()->didReceiveResponse(handle, response);
 
-        CString encodedData = TextEncoding().encode(data.characters(), data.length(), URLEncodedEntitiesForUnencodables);
+        CString encodedData = encoding.encode(data.characters(), data.length(), URLEncodedEntitiesForUnencodables);
         response.setExpectedContentLength(encodedData.length());
         if (encodedData.length())