<!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>[197865] trunk/Source/WebKit2</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/197865">197865</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-03-09 11:04:07 -0800 (Wed, 09 Mar 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Always call NSURLSession completion handlers
https://bugs.webkit.org/show_bug.cgi?id=155137
Patch by Alex Christensen <achristensen@webkit.org> on 2016-03-09
Reviewed by Darin Adler.
There are some edge cases which should not be hit, but if they are they would cause the
network process to hang and network resources to be leaked. This can be avoided.
There are also a few release asserts that do not need to crash release builds.
* NetworkProcess/cocoa/NetworkDataTaskCocoa.mm:
(WebKit::NetworkDataTask::NetworkDataTask):
(WebKit::NetworkDataTask::didReceiveChallenge):
(WebKit::NetworkDataTask::didCompleteWithError):
(WebKit::NetworkDataTask::didReceiveResponse):
(WebKit::NetworkDataTask::didReceiveData):
(WebKit::NetworkDataTask::willPerformHTTPRedirection):
(WebKit::NetworkDataTask::scheduleFailure):
(WebKit::NetworkDataTask::tryPasswordBasedAuthentication):
* NetworkProcess/cocoa/NetworkSessionCocoa.mm:
(-[WKNetworkSessionDelegate URLSession:task:willPerformHTTPRedirection:newRequest:completionHandler:]):
(-[WKNetworkSessionDelegate URLSession:task:didReceiveChallenge:completionHandler:]):
(-[WKNetworkSessionDelegate URLSession:dataTask:didReceiveResponse:completionHandler:]):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcesscocoaNetworkDataTaskCocoamm">trunk/Source/WebKit2/NetworkProcess/cocoa/NetworkDataTaskCocoa.mm</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcesscocoaNetworkSessionCocoamm">trunk/Source/WebKit2/NetworkProcess/cocoa/NetworkSessionCocoa.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (197864 => 197865)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2016-03-09 18:45:18 UTC (rev 197864)
+++ trunk/Source/WebKit2/ChangeLog 2016-03-09 19:04:07 UTC (rev 197865)
</span><span class="lines">@@ -1,3 +1,28 @@
</span><ins>+2016-03-09 Alex Christensen <achristensen@webkit.org>
+
+ Always call NSURLSession completion handlers
+ https://bugs.webkit.org/show_bug.cgi?id=155137
+
+ Reviewed by Darin Adler.
+
+ There are some edge cases which should not be hit, but if they are they would cause the
+ network process to hang and network resources to be leaked. This can be avoided.
+ There are also a few release asserts that do not need to crash release builds.
+
+ * NetworkProcess/cocoa/NetworkDataTaskCocoa.mm:
+ (WebKit::NetworkDataTask::NetworkDataTask):
+ (WebKit::NetworkDataTask::didReceiveChallenge):
+ (WebKit::NetworkDataTask::didCompleteWithError):
+ (WebKit::NetworkDataTask::didReceiveResponse):
+ (WebKit::NetworkDataTask::didReceiveData):
+ (WebKit::NetworkDataTask::willPerformHTTPRedirection):
+ (WebKit::NetworkDataTask::scheduleFailure):
+ (WebKit::NetworkDataTask::tryPasswordBasedAuthentication):
+ * NetworkProcess/cocoa/NetworkSessionCocoa.mm:
+ (-[WKNetworkSessionDelegate URLSession:task:willPerformHTTPRedirection:newRequest:completionHandler:]):
+ (-[WKNetworkSessionDelegate URLSession:task:didReceiveChallenge:completionHandler:]):
+ (-[WKNetworkSessionDelegate URLSession:dataTask:didReceiveResponse:completionHandler:]):
+
</ins><span class="cx"> 2016-03-08 Sam Weinig <sam@webkit.org>
</span><span class="cx">
</span><span class="cx"> Roll r197632 back in now that the bots have caught up.
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesscocoaNetworkDataTaskCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/cocoa/NetworkDataTaskCocoa.mm (197864 => 197865)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/cocoa/NetworkDataTaskCocoa.mm 2016-03-09 18:45:18 UTC (rev 197864)
+++ trunk/Source/WebKit2/NetworkProcess/cocoa/NetworkDataTaskCocoa.mm 2016-03-09 19:04:07 UTC (rev 197865)
</span><span class="lines">@@ -85,7 +85,7 @@
</span><span class="cx"> else
</span><span class="cx"> storageSession->credentialStorage().set(WebCore::Credential(m_user, m_password, WebCore::CredentialPersistenceNone), url);
</span><span class="cx"> } else
</span><del>- RELEASE_ASSERT_NOT_REACHED();
</del><ins>+ ASSERT_NOT_REACHED();
</ins><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -154,6 +154,10 @@
</span><span class="cx">
</span><span class="cx"> if (m_client)
</span><span class="cx"> m_client->didReceiveChallenge(challenge, completionHandler);
</span><ins>+ else {
+ ASSERT_NOT_REACHED();
+ completionHandler(AuthenticationChallengeDisposition::PerformDefaultHandling, { });
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void NetworkDataTask::didCompleteWithError(const WebCore::ResourceError& error)
</span><span class="lines">@@ -166,6 +170,10 @@
</span><span class="cx"> {
</span><span class="cx"> if (m_client)
</span><span class="cx"> m_client->didReceiveResponseNetworkSession(response, completionHandler);
</span><ins>+ else {
+ ASSERT_NOT_REACHED();
+ completionHandler(WebCore::PolicyAction::PolicyIgnore);
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void NetworkDataTask::didReceiveData(RefPtr<WebCore::SharedBuffer>&& data)
</span><span class="lines">@@ -222,13 +230,17 @@
</span><span class="cx"> applyBasicAuthorizationHeader(request, m_initialCredential);
</span><span class="cx"> }
</span><span class="cx"> } else
</span><del>- RELEASE_ASSERT_NOT_REACHED();
</del><ins>+ ASSERT_NOT_REACHED();
</ins><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (m_client)
</span><span class="cx"> m_client->willPerformHTTPRedirection(redirectResponse, request, completionHandler);
</span><ins>+ else {
+ ASSERT_NOT_REACHED();
+ completionHandler({ });
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void NetworkDataTask::scheduleFailure(FailureType type)
</span><span class="lines">@@ -307,7 +319,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> } else
</span><del>- RELEASE_ASSERT_NOT_REACHED();
</del><ins>+ ASSERT_NOT_REACHED();
</ins><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesscocoaNetworkSessionCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/cocoa/NetworkSessionCocoa.mm (197864 => 197865)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/cocoa/NetworkSessionCocoa.mm 2016-03-09 18:45:18 UTC (rev 197864)
+++ trunk/Source/WebKit2/NetworkProcess/cocoa/NetworkSessionCocoa.mm 2016-03-09 19:04:07 UTC (rev 197865)
</span><span class="lines">@@ -113,6 +113,9 @@
</span><span class="cx"> completionHandlerCopy(request.nsURLRequest(WebCore::UpdateHTTPBody));
</span><span class="cx"> Block_release(completionHandlerCopy);
</span><span class="cx"> });
</span><ins>+ } else {
+ ASSERT_NOT_REACHED();
+ completionHandler(nil);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -137,6 +140,8 @@
</span><span class="cx"> urlToStore = authenticationChallenge.failureResponse().url();
</span><span class="cx"> if (auto storageSession = WebKit::SessionTracker::storageSession(sessionID))
</span><span class="cx"> storageSession->credentialStorage().set(nonPersistentCredential, authenticationChallenge.protectionSpace(), urlToStore);
</span><ins>+ else
+ ASSERT_NOT_REACHED();
</ins><span class="cx">
</span><span class="cx"> completionHandlerCopy(toNSURLSessionAuthChallengeDisposition(disposition), nonPersistentCredential.nsCredential());
</span><span class="cx"> } else
</span><span class="lines">@@ -145,6 +150,9 @@
</span><span class="cx"> Block_release(completionHandlerCopy);
</span><span class="cx"> };
</span><span class="cx"> networkDataTask->didReceiveChallenge(challenge, challengeCompletionHandler);
</span><ins>+ } else {
+ ASSERT_NOT_REACHED();
+ completionHandler(NSURLSessionAuthChallengePerformDefaultHandling, nil);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -180,6 +188,9 @@
</span><span class="cx"> completionHandlerCopy(toNSURLSessionResponseDisposition(policyAction));
</span><span class="cx"> Block_release(completionHandlerCopy);
</span><span class="cx"> });
</span><ins>+ } else {
+ ASSERT_NOT_REACHED();
+ completionHandler(NSURLSessionResponseCancel);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>