<!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>[186869] branches/safari-600.8-branch/Source</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/186869">186869</a></dd>

<dt>Author</dt> <dd>matthew_hanson@apple.com</dd>

<dt>Date</dt> <dd>2015-07-15 16:04:41 -0700 (Wed, 15 Jul 2015)</dd>

</dl>

<h3>Log Message</h3>

<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/186559">r186559</a>. rdar://problem/21716363</pre>

<h3>Modified Paths</h3>

<ul>

<li><a href="#branchessafari6008branchSourceWebCoreWebCoreexpin">branches/safari-600.8-branch/Source/WebCore/WebCore.exp.in</a></li>

<li><a href="#branchessafari6008branchSourceWebKit2ChangeLog">branches/safari-600.8-branch/Source/WebKit2/ChangeLog</a></li>

<li><a href="#branchessafari6008branchSourceWebKit2NetworkProcessNetworkResourceLoadercpp">branches/safari-600.8-branch/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp</a></li>

<li><a href="#branchessafari6008branchSourceWebKit2SharedAuthenticationAuthenticationManagercpp">branches/safari-600.8-branch/Source/WebKit2/Shared/Authentication/AuthenticationManager.cpp</a></li>

</ul>

</div>

<div id="patch">

<h3>Diff</h3>

<a id="branchessafari6008branchSourceWebCoreWebCoreexpin"></a>

<div class="modfile"><h4>Modified: branches/safari-600.8-branch/Source/WebCore/WebCore.exp.in (186868 => 186869)</h4>

<pre class="diff"><span>

<span class="info">--- branches/safari-600.8-branch/Source/WebCore/WebCore.exp.in        2015-07-15 23:00:30 UTC (rev 186868)

+++ branches/safari-600.8-branch/Source/WebCore/WebCore.exp.in        2015-07-15 23:04:41 UTC (rev 186869)

</span><span class="lines">@@ -404,6 +404,7 @@

</span><span class="cx"> __ZN7WebCore14ResourceHandle26synchronousLoadRunLoopModeEv

</span><span class="cx"> __ZN7WebCore14ResourceHandle45continueCanAuthenticateAgainstProtectionSpaceEb

</span><span class="cx"> __ZN7WebCore14ResourceHandle6createEPNS_17NetworkingContextERKNS_15ResourceRequestEPNS_20ResourceHandleClientEbb

</span><ins>+__ZN7WebCore14ResourceHandle9setClientEPNS_20ResourceHandleClientE

</ins><span class="cx"> __ZN7WebCore14ResourceLoader14cancelledErrorEv

</span><span class="cx"> __ZN7WebCore14ResourceLoader32didCancelAuthenticationChallengeERKNS_23AuthenticationChallengeE

</span><span class="cx"> __ZN7WebCore14ResourceLoader6cancelERKNS_13ResourceErrorE

</span><span class="lines">@@ -2648,7 +2649,6 @@

</span><span class="cx"> __ZN7WebCore14IconController3urlEv

</span><span class="cx"> __ZN7WebCore14RenderThemeIOS22setContentSizeCategoryERKN3WTF6StringE

</span><span class="cx"> __ZN7WebCore14ResourceHandle6cancelEv

</span><del>-__ZN7WebCore14ResourceHandle9setClientEPNS_20ResourceHandleClientE

</del><span class="cx"> __ZN7WebCore14ResourceHandleD1Ev

</span><span class="cx"> __ZN7WebCore14areRangesEqualEPKNS_5RangeES2_

</span><span class="cx"> __ZN7WebCore14cookiesEnabledERKNS_21NetworkStorageSessionERKNS_3URLES5_

</span></span></pre></div>

<a id="branchessafari6008branchSourceWebKit2ChangeLog"></a>

<div class="modfile"><h4>Modified: branches/safari-600.8-branch/Source/WebKit2/ChangeLog (186868 => 186869)</h4>

<pre class="diff"><span>

<span class="info">--- branches/safari-600.8-branch/Source/WebKit2/ChangeLog        2015-07-15 23:00:30 UTC (rev 186868)

+++ branches/safari-600.8-branch/Source/WebKit2/ChangeLog        2015-07-15 23:04:41 UTC (rev 186869)

</span><span class="lines">@@ -1,5 +1,32 @@

</span><span class="cx"> 2015-07-15  Matthew Hanson  &lt;matthew_hanson@apple.com&gt;

</span><span class="cx"> 

</span><ins>+        Merge r186559. rdar://problem/21716363

+

+    2015-07-08  Matthew Hanson  &lt;matthew_hanson@apple.com&gt;

+

+            Merge r183861. rdar://problem/21716677

+

+        2015-05-05  Alexey Proskuryakov  &lt;ap@apple.com&gt;

+

+                NetworkResourceLoader::cleanup() should clear ResourceHandle client pointer.

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

+                rdar://problem/20250960

+

+                Reviewed by David Kilzer.

+

+                * NetworkProcess/NetworkResourceLoader.cpp: (WebKit::NetworkResourceLoader::cleanup):

+                Clear the client pointer.

+

+                * Shared/Authentication/AuthenticationManager.cpp:

+                (WebKit::AuthenticationManager::useCredentialForChallenge):

+                (WebKit::AuthenticationManager::continueWithoutCredentialForChallenge):

+                (WebKit::AuthenticationManager::cancelChallenge):

+                (WebKit::AuthenticationManager::performDefaultHandling):

+                (WebKit::AuthenticationManager::rejectProtectionSpaceAndContinue):

+                Updated comments, which were not accurate, at least on Mac.

+

+2015-07-15  Matthew Hanson  &lt;matthew_hanson@apple.com&gt;

+

</ins><span class="cx">         Merge r186781. rdar://problem/21708063

</span><span class="cx"> 

</span><span class="cx">     2015-07-13  David Kilzer  &lt;ddkilzer@apple.com&gt;

</span></span></pre></div>

<a id="branchessafari6008branchSourceWebKit2NetworkProcessNetworkResourceLoadercpp"></a>

<div class="modfile"><h4>Modified: branches/safari-600.8-branch/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp (186868 => 186869)</h4>

<pre class="diff"><span>

<span class="info">--- branches/safari-600.8-branch/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp        2015-07-15 23:00:30 UTC (rev 186868)

+++ branches/safari-600.8-branch/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp        2015-07-15 23:04:41 UTC (rev 186869)

</span><span class="lines">@@ -98,7 +98,7 @@

</span><span class="cx">         m_resourceSandboxExtensions.append(resourceSandboxExtension);

</span><span class="cx"> 

</span><span class="cx">     ASSERT(RunLoop::isMain());

</span><del>-    

</del><ins>+

</ins><span class="cx">     if (reply || parameters.shouldBufferResource)

</span><span class="cx">         m_bufferedData = WebCore::SharedBuffer::create();

</span><span class="cx"> 

</span><span class="lines">@@ -161,12 +161,9 @@

</span><span class="cx"> 

<span class="cx">     // Tell the scheduler about this finished loader soon so it can start more network requests.

</span><span class="cx">     NetworkProcess::shared().networkResourceLoadScheduler().scheduleRemoveLoader(this);

</span><del>-

</del><span class="cx">     if (m_handle) {

</span><del>-        // Explicit deref() balanced by a ref() in NetworkResourceLoader::start()

-        // This might cause the NetworkResourceLoader to be destroyed and therefore we do it last.

-        m_handle = 0;

-        deref();

</del><ins>+        m_handle-&gt;setClient(nullptr);

+        m_handle = nullptr;

</ins><span class="cx">     }

</span><span class="cx"> }

</span><span class="cx"> 

</span><span class="lines">@@ -215,7 +212,7 @@

</span><span class="cx"> 

<span class="cx">     // FIXME (NetworkProcess): For the memory cache we'll also need to cache the response data here.

<span class="cx">     // Such buffering will need to be thread safe, as this callback is happening on a background thread.

</span><del>-    

</del><ins>+

</ins><span class="cx">     m_bytesReceived += buffer-&gt;size();

</span><span class="cx">     if (m_bufferedData)

</span><span class="cx">         m_bufferedData-&gt;append(buffer.get());

</span></span></pre></div>

<a id="branchessafari6008branchSourceWebKit2SharedAuthenticationAuthenticationManagercpp"></a>

<div class="modfile"><h4>Modified: branches/safari-600.8-branch/Source/WebKit2/Shared/Authentication/AuthenticationManager.cpp (186868 => 186869)</h4>

<pre class="diff"><span>

<span class="info">--- branches/safari-600.8-branch/Source/WebKit2/Shared/Authentication/AuthenticationManager.cpp        2015-07-15 23:00:30 UTC (rev 186868)

+++ branches/safari-600.8-branch/Source/WebKit2/Shared/Authentication/AuthenticationManager.cpp        2015-07-15 23:04:41 UTC (rev 186869)

</span><span class="lines">@@ -116,7 +116,8 @@

</span><span class="cx">     

</span><span class="cx">     AuthenticationClient* coreClient = challenge.authenticationClient();

</span><span class="cx">     if (!coreClient) {