Changeset 142574 in webkit

Timestamp:

Feb 11, 2013 8:34:21 PM (11 years ago)

Author:

commit-queue@webkit.org

Message:

[Curl] setCookiesFromDOM function does not save cookies to disk.
​https://bugs.webkit.org/show_bug.cgi?id=109285

Patch by ​peavo@outlook.com <​peavo@outlook.com> on 2013-02-11
Reviewed by Brent Fulgham.

Write cookies to disk by using the Curl easy api.

• platform/network/curl/CookieJarCurl.cpp:

(WebCore::setCookiesFromDOM):Write cookie to disk.

• platform/network/curl/ResourceHandleManager.cpp:

(WebCore::ResourceHandleManager::getCurlShareHandle): Added method to get Curl share handle.
(WebCore::ResourceHandleManager::getCookieJarFileName): Added method to get cookie file name.

• platform/network/curl/ResourceHandleManager.h: Added methods to get cookie file name, and Curl share handle.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/network/curl/CookieJarCurl.cpp (modified) (2 diffs)
• platform/network/curl/ResourceHandleManager.cpp (modified) (1 diff)
• platform/network/curl/ResourceHandleManager.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-02-11  peavo@outlook.com  <peavo@outlook.com>
+
+        [Curl] setCookiesFromDOM function does not save cookies to disk.
+        https://bugs.webkit.org/show_bug.cgi?id=109285
+
+        Reviewed by Brent Fulgham.
+
+        Write cookies to disk by using the Curl easy api.
+
+        * platform/network/curl/CookieJarCurl.cpp:
+        (WebCore::setCookiesFromDOM):Write cookie to disk.
+        * platform/network/curl/ResourceHandleManager.cpp:
+        (WebCore::ResourceHandleManager::getCurlShareHandle): Added method to get Curl share handle.
+        (WebCore::ResourceHandleManager::getCookieJarFileName): Added method to get cookie file name.
+        * platform/network/curl/ResourceHandleManager.h: Added methods to get cookie file name, and Curl share handle.
+
 2013-02-11  Hayato Ito  <hayato@chromium.org>
 

trunk/Source/WebCore/platform/network/curl/CookieJarCurl.cpp

@@ -20 +20 @@
 #include "Cookie.h"
 #include "KURL.h"
+#include "ResourceHandleManager.h"
+
 #include <wtf/HashMap.h>
 #include <wtf/text/StringHash.h>
@@ -31 +33 @@
 {
     cookieJar.set(url.string(), value);
+
+    CURL* curl = curl_easy_init();
+
+    if (!curl)
+        return;
+
+    const char* cookieJarFileName = ResourceHandleManager::sharedInstance()->getCookieJarFileName();
+    CURLSH* curlsh = ResourceHandleManager::sharedInstance()->getCurlShareHandle();
+
+    curl_easy_setopt(curl, CURLOPT_COOKIEJAR, cookieJarFileName);
+    curl_easy_setopt(curl, CURLOPT_COOKIEFILE, cookieJarFileName);
+    curl_easy_setopt(curl, CURLOPT_SHARE, curlsh);
+
+    String cookie("Set-Cookie: ");
+    if (value.is8Bit())
+        cookie.append(value);
+    else
+        cookie.append(String::make8BitFrom16BitSource(value.characters16(), value.length()));
+
+    CString strCookie(reinterpret_cast<const char*>(cookie.characters8()), cookie.length());
+
+    curl_easy_setopt(curl, CURLOPT_COOKIELIST, strCookie.data());
+
+    curl_easy_cleanup(curl);
 }
 

trunk/Source/WebCore/platform/network/curl/ResourceHandleManager.cpp

@@ -152 +152 @@
 }
 
+CURLSH* ResourceHandleManager::getCurlShareHandle() const
+{
+    return m_curlShareHandle;
+}
+
 void ResourceHandleManager::setCookieJarFileName(const char* cookieJarFileName)
 {
     m_cookieJarFileName = fastStrDup(cookieJarFileName);
+}
+
+const char* ResourceHandleManager::getCookieJarFileName() const
+{
+    return m_cookieJarFileName;
 }
 

trunk/Source/WebCore/platform/network/curl/ResourceHandleManager.h

@@ -57 +57 @@
     void add(ResourceHandle*);
     void cancel(ResourceHandle*);
+
+    CURLSH* getCurlShareHandle() const;
+
     void setCookieJarFileName(const char* cookieJarFileName);
+    const char* getCookieJarFileName() const;
 
     void dispatchSynchronousJob(ResourceHandle*);