<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[171566] branches/safari-600.1-branch/Source/WebCore</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/171566">171566</a></dd>
<dt>Author</dt> <dd>lforschler@apple.com</dd>
<dt>Date</dt> <dd>2014-07-24 18:03:00 -0700 (Thu, 24 Jul 2014)</dd>
</dl>

<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/171559">r171559</a>.  &lt;rdar://problem/17598815&gt;</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari6001branchSourceWebCoreChangeLog">branches/safari-600.1-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari6001branchSourceWebCoreplatformnetworkcfResourceRequestCFNetcpp">branches/safari-600.1-branch/Source/WebCore/platform/network/cf/ResourceRequestCFNet.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari6001branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebCore/ChangeLog (171565 => 171566)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,5 +1,30 @@
</span><span class="cx"> 2014-07-24  Lucas Forschler  &lt;lforschler@apple.com&gt;
</span><span class="cx"> 
</span><ins>+        Merge r171559
+
+    2014-07-24  Daniel Bates  &lt;dabates@apple.com&gt;
+                And Alexey Proskuryakov  &lt;ap@apple.com&gt;
+
+            [iOS] REGRESSION (WebKit2): Can't login to Wordpress.com, facebook.com when always allowing cookies
+            https://bugs.webkit.org/show_bug.cgi?id=135273
+            &lt;rdar://problem/17598815&gt;
+
+            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  &lt;lforschler@apple.com&gt;
+
</ins><span class="cx">         Merge r171505
</span><span class="cx"> 
</span><span class="cx">     2014-07-23  Joseph Pecoraro  &lt;pecoraro@apple.com&gt;
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebCoreplatformnetworkcfResourceRequestCFNetcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebCore/platform/network/cf/ResourceRequestCFNet.cpp (171565 => 171566)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -177,14 +177,6 @@
</span><span class="cx">     }
</span><span class="cx">     setContentDispositionEncodingFallbackArray(cfRequest, encodingFallbacks.get());
</span><span class="cx"> 
</span><del>-    if (m_cfRequest) {
-        RetainPtr&lt;CFHTTPCookieStorageRef&gt; cookieStorage = adoptCF(CFURLRequestCopyHTTPCookieStorage(m_cfRequest.get()));
-        if (cookieStorage)
-            CFURLRequestSetHTTPCookieStorage(cfRequest, cookieStorage.get());
-        CFURLRequestSetHTTPCookieStorageAcceptPolicy(cfRequest, CFURLRequestGetHTTPCookieStorageAcceptPolicy(m_cfRequest.get()));
-        CFURLRequestSetSSLProperties(cfRequest, CFURLRequestGetSSLProperties(m_cfRequest.get()));
-    }
-
</del><span class="cx"> #if ENABLE(CACHE_PARTITIONING)
</span><span class="cx">     String partition = cachePartition();
</span><span class="cx">     if (!partition.isNull() &amp;&amp; !partition.isEmpty()) {
</span></span></pre>
</div>
</div>

</body>
</html>