Title: [171566] branches/safari-600.1-branch/Source/WebCore
- Revision
- 171566
- Author
- [email protected]
- Date
- 2014-07-24 18:03:00 -0700 (Thu, 24 Jul 2014)
Log Message
Merged r171559. <rdar://problem/17598815>
Modified Paths
Diff
Modified: branches/safari-600.1-branch/Source/WebCore/ChangeLog (171565 => 171566)
--- branches/safari-600.1-branch/Source/WebCore/ChangeLog 2014-07-25 00:59:34 UTC (rev 171565)
+++ branches/safari-600.1-branch/Source/WebCore/ChangeLog 2014-07-25 01:03:00 UTC (rev 171566)
@@ -1,5 +1,30 @@
2014-07-24 Lucas Forschler <[email protected]>
+ Merge r171559
+
+ 2014-07-24 Daniel Bates <[email protected]>
+ And Alexey Proskuryakov <[email protected]>
+
+ [iOS] REGRESSION (WebKit2): Can't login to Wordpress.com, facebook.com when always allowing cookies
+ https://bugs.webkit.org/show_bug.cgi?id=135273
+ <rdar://problem/17598815>
+
+ Reviewed by Alexey Proskuryakov.
+
+ Fixes an issue where cookies may be created in the wrong cookie store.
+
+ Currently, when we update the CFURLRequest object associated with a ResourceRequest object
+ we explicitly set a cookie storage, cookie accept policy, and SSL properties based on the
+ corresponding values in the old CFURLRequest object (if we have one). This ultimately leads
+ to CFNetwork associating the cookies for the request with a different cookie store when we
+ handle the request in the NetworkProcess. Instead, we shouldn't set these properties
+ explicitly as we already copy them implicitly earlier (via CFURLRequestCreateMutableCopy()).
+
+ * platform/network/cf/ResourceRequestCFNet.cpp:
+ (WebCore::ResourceRequest::doUpdatePlatformRequest):
+
+2014-07-24 Lucas Forschler <[email protected]>
+
Merge r171505
2014-07-23 Joseph Pecoraro <[email protected]>
Modified: branches/safari-600.1-branch/Source/WebCore/platform/network/cf/ResourceRequestCFNet.cpp (171565 => 171566)
--- branches/safari-600.1-branch/Source/WebCore/platform/network/cf/ResourceRequestCFNet.cpp 2014-07-25 00:59:34 UTC (rev 171565)
+++ branches/safari-600.1-branch/Source/WebCore/platform/network/cf/ResourceRequestCFNet.cpp 2014-07-25 01:03:00 UTC (rev 171566)
@@ -177,14 +177,6 @@
}
setContentDispositionEncodingFallbackArray(cfRequest, encodingFallbacks.get());
- if (m_cfRequest) {
- RetainPtr<CFHTTPCookieStorageRef> cookieStorage = adoptCF(CFURLRequestCopyHTTPCookieStorage(m_cfRequest.get()));
- if (cookieStorage)
- CFURLRequestSetHTTPCookieStorage(cfRequest, cookieStorage.get());
- CFURLRequestSetHTTPCookieStorageAcceptPolicy(cfRequest, CFURLRequestGetHTTPCookieStorageAcceptPolicy(m_cfRequest.get()));
- CFURLRequestSetSSLProperties(cfRequest, CFURLRequestGetSSLProperties(m_cfRequest.get()));
- }
-
#if ENABLE(CACHE_PARTITIONING)
String partition = cachePartition();
if (!partition.isNull() && !partition.isEmpty()) {
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
