Changeset 109783 in webkit

Timestamp:

Mar 5, 2012 12:28:18 PM (12 years ago)

Author:

rwlbuis@webkit.org

Message:

[BlackBerry] UTF chars printed back from cookie through php shows as ???
​https://bugs.webkit.org/show_bug.cgi?id=80307

Reviewed by Antonio Gomes.

PR: 130055

we need to check the cookies encoding first and encode the cookie header data
to pass to the request.

• platform/network/blackberry/NetworkManager.cpp:

(WebCore::NetworkManager::startJob):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/network/blackberry/NetworkManager.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-03-05  Rob Buis  <rbuis@rim.com>
+
+        [BlackBerry] UTF chars printed back from cookie through php shows as ???
+        https://bugs.webkit.org/show_bug.cgi?id=80307
+
+        Reviewed by Antonio Gomes.
+
+        PR: 130055
+
+        we need to check the cookies encoding first and encode the cookie header data
+        to pass to the request.
+
+        * platform/network/blackberry/NetworkManager.cpp:
+        (WebCore::NetworkManager::startJob):
+
 2012-03-05  Dana Jansens  <danakj@chromium.org>
 

trunk/Source/WebCore/platform/network/blackberry/NetworkManager.cpp

@@ -123 +123 @@
         String cookiePairs = cookieManager().getCookie(url, WithHttpOnlyCookies);
         if (!cookiePairs.isEmpty()) {
-            // We encode the cookie header data using utf8 to support unicode characters.
-            // For more information, look at RFC5987 - 4.1 (http://tools.ietf.org/html/rfc5987#ref-ISO-8859-1).
-            platformRequest.setCookieData(cookiePairs.utf8().data());
+            // We need to check the encoding and encode the cookie header data using latin1 or utf8 to support unicode characters.
+            platformRequest.setCookieData(cookiePairs.containsOnlyLatin1() ? cookiePairs.latin1().data() : cookiePairs.utf8().data());
         }
     }