Fix LayoutTests/fast/cookies/local-file-can-set-cookies.html

In WebCore::cookies() don't return the full raw form but only the name=value
part. This fixes the getter part of the above test. The above test also
requires a parsing fix in Qt 4.4's QNetworkCookie to fully pass.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@29622 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index a04499e..e1ffe10 100644 (file)
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -2,6 +2,20 @@
 
         Reviewed by Holger.
 
+        Fix LayoutTests/fast/cookies/local-file-can-set-cookies.html
+        
+        In WebCore::cookies() don't return the full raw form but only the name=value
+        part. This fixes the getter part of the above test. The above test also
+        requires a parsing fix in Qt 4.4's QNetworkCookie to fully pass.
+        
+
+        * platform/qt/CookieJarQt.cpp:
+        (WebCore::cookies):
+
+2008-01-18  Simon Hausmann  <hausmann@webkit.org>
+
+        Reviewed by Holger.
+
         Fix svg/custom/path-getTotalLength.svg
         
         Path::apply creates a PathElement and its points array on the stack,

diff --git a/WebCore/platform/qt/CookieJarQt.cpp b/WebCore/platform/qt/CookieJarQt.cpp
index 6ad8740..d086a69 100644 (file)
--- a/WebCore/platform/qt/CookieJarQt.cpp
+++ b/WebCore/platform/qt/CookieJarQt.cpp
@@ -87,7 +87,7 @@ String cookies(const Document* document, const KURL& url)
     if (cookies.isEmpty())
         return String();
 
-    return QString::fromAscii(cookies.first().toRawForm());
+    return QString::fromAscii(cookies.first().toRawForm(QNetworkCookie::NameAndValueOnly));
 #else
     QString cookies = QCookieJar::cookieJar()->cookies(u);
     int idx = cookies.indexOf(QLatin1Char(';'));