Use the same cookie storage as WebCore when using NETWORK_SESSION

https://bugs.webkit.org/show_bug.cgi?id=150833

Patch by Alex Christensen <achristensen@webkit.org> on 2015-11-03
Reviewed by Antti Koivisto.

This fixes 12 tests when using NETWORK_SESSION.

* NetworkProcess/cocoa/NetworkSessionCocoa.mm:
(WebKit::NetworkSession::NetworkSession):

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

diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog
index fd36033650fcf228f166693b9f4a6065776b616a..6d2f5742f50b40a12f67bdeb42152686b5dd8b5f 100644 (file)
--- a/Source/WebKit2/ChangeLog
+++ b/Source/WebKit2/ChangeLog
@@ -1,3 +1,15 @@
+2015-11-03  Alex Christensen  <achristensen@webkit.org>
+
+        Use the same cookie storage as WebCore when using NETWORK_SESSION
+        https://bugs.webkit.org/show_bug.cgi?id=150833
+
+        Reviewed by Antti Koivisto.
+
+        This fixes 12 tests when using NETWORK_SESSION.
+
+        * NetworkProcess/cocoa/NetworkSessionCocoa.mm:
+        (WebKit::NetworkSession::NetworkSession):
+
 2015-11-03  Alex Christensen  <achristensen@webkit.org>
 
         Clean up NETWORK_SESSION code after r191848

diff --git a/Source/WebKit2/NetworkProcess/cocoa/NetworkSessionCocoa.mm b/Source/WebKit2/NetworkProcess/cocoa/NetworkSessionCocoa.mm
index 7ab14a28bce7d16fea7b7a6e830372d5a696908c..73371b1b8f8b16fc975b6f7e8edd57d38628e64a 100644 (file)
--- a/Source/WebKit2/NetworkProcess/cocoa/NetworkSessionCocoa.mm
+++ b/Source/WebKit2/NetworkProcess/cocoa/NetworkSessionCocoa.mm
@@ -28,9 +28,10 @@
 
 #if USE(NETWORK_SESSION)
 
+#import "SessionTracker.h"
 #import <Foundation/NSURLSession.h>
-
 #import <WebCore/AuthenticationChallenge.h>
+#import <WebCore/CFNetworkSPI.h>
 #import <WebCore/Credential.h>
 #import <WebCore/ResourceError.h>
 #import <WebCore/ResourceRequest.h>
@@ -183,6 +184,11 @@ NetworkSession::NetworkSession(Type type)
     m_sessionDelegate = adoptNS([[NetworkSessionDelegate alloc] initWithNetworkSession:*this]);
 
     NSURLSessionConfiguration *configuration = configurationForType(type);
+    // FIXME: Use SessionTracker to make sure the correct cookie storage is used once there is more than one NetworkSession.
+    if (auto* session = SessionTracker::session(WebCore::SessionID::defaultSessionID())) {
+        if (CFHTTPCookieStorageRef storage = session->cookieStorage().get())
+            configuration.HTTPCookieStorage = [[[NSHTTPCookieStorage alloc] _initWithCFHTTPCookieStorage:storage] autorelease];
+    }
     m_session = [NSURLSession sessionWithConfiguration:configuration delegate:static_cast<id>(m_sessionDelegate.get()) delegateQueue:[NSOperationQueue mainQueue]];
 }