<!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>[195509] trunk/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/195509">195509</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-01-23 01:44:10 -0800 (Sat, 23 Jan 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Use credentials from a URL with NetworkSession like we did with ResourceHandle
https://bugs.webkit.org/show_bug.cgi?id=153328
Patch by Alex Christensen <achristensen@webkit.org> on 2016-01-23
Reviewed by Alexey Proskuryakov.
Source/WebCore:
This patch fixes at least http/tests/xmlhttprequest/basic-auth-credentials-escaping.html when using NetworkSession.
* platform/network/ProtectionSpaceBase.h:
(WebCore::ProtectionSpaceBase::encodingRequiresPlatformData):
* platform/network/ResourceRequestBase.h:
Add some WEBCORE_EXPORT macros for functions that are now used in WebKit2.
Source/WebKit2:
* NetworkProcess/NetworkLoad.cpp:
(WebKit::NetworkLoad::NetworkLoad):
createDataTaskWithRequest is being removed, so use std::make_unique<NetworkDataTask> directly instead.
Also, create the task even if we are deferring loading. Don't call resume if we are deferring loading.
* NetworkProcess/NetworkSession.h:
Callbacks are not just used in NetworkSessionTaskClient, so declare them outside.
The NetworkDataTask now takes a ResourceRequest so we can strip its credentials.
* NetworkProcess/cocoa/NetworkSessionCocoa.mm:
(-[WKNetworkSessionDelegate URLSession:task:didReceiveChallenge:completionHandler:]):
Try credentials stored with the NetworkDataTask before asking the client for credentials.
(WebKit::NetworkSession::~NetworkSession):
(WebKit::NetworkSession::dataTaskForIdentifier):
(WebKit::NetworkSession::takeDownloadID):
(WebKit::NetworkDataTask::NetworkDataTask):
Strip the credentials from the url before creating the task because we do not know the authentication type.
We will use these credentials when a challenge is received.
(WebKit::NetworkDataTask::~NetworkDataTask):
(WebKit::NetworkDataTask::tryPasswordBasedAuthentication):
If we have credentials from the initial URL, try using them if it is appropriate.
(WebKit::NetworkDataTask::cancel):
(WebKit::NetworkSession::createDataTaskWithRequest): Deleted.
* Shared/Authentication/AuthenticationManager.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkProtectionSpaceBaseh">trunk/Source/WebCore/platform/network/ProtectionSpaceBase.h</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkResourceRequestBaseh">trunk/Source/WebCore/platform/network/ResourceRequestBase.h</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessNetworkLoadcpp">trunk/Source/WebKit2/NetworkProcess/NetworkLoad.cpp</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessNetworkSessionh">trunk/Source/WebKit2/NetworkProcess/NetworkSession.h</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcesscocoaNetworkSessionCocoamm">trunk/Source/WebKit2/NetworkProcess/cocoa/NetworkSessionCocoa.mm</a></li>
<li><a href="#trunkSourceWebKit2SharedAuthenticationAuthenticationManagerh">trunk/Source/WebKit2/Shared/Authentication/AuthenticationManager.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (195508 => 195509)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-01-23 08:19:12 UTC (rev 195508)
+++ trunk/Source/WebCore/ChangeLog 2016-01-23 09:44:10 UTC (rev 195509)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2016-01-23 Alex Christensen <achristensen@webkit.org>
+
+ Use credentials from a URL with NetworkSession like we did with ResourceHandle
+ https://bugs.webkit.org/show_bug.cgi?id=153328
+
+ Reviewed by Alexey Proskuryakov.
+
+ This patch fixes at least http/tests/xmlhttprequest/basic-auth-credentials-escaping.html when using NetworkSession.
+
+ * platform/network/ProtectionSpaceBase.h:
+ (WebCore::ProtectionSpaceBase::encodingRequiresPlatformData):
+ * platform/network/ResourceRequestBase.h:
+ Add some WEBCORE_EXPORT macros for functions that are now used in WebKit2.
+
</ins><span class="cx"> 2016-01-23 Brady Eidson <beidson@apple.com>
</span><span class="cx">
</span><span class="cx"> Modern IDB: Implement clearing object stores and opening cursors in the SQLite backend.
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkProtectionSpaceBaseh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/ProtectionSpaceBase.h (195508 => 195509)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/ProtectionSpaceBase.h 2016-01-23 08:19:12 UTC (rev 195508)
+++ trunk/Source/WebCore/platform/network/ProtectionSpaceBase.h 2016-01-23 09:44:10 UTC (rev 195509)
</span><span class="lines">@@ -68,7 +68,7 @@
</span><span class="cx"> WEBCORE_EXPORT ProtectionSpaceAuthenticationScheme authenticationScheme() const;
</span><span class="cx">
</span><span class="cx"> bool receivesCredentialSecurely() const;
</span><del>- bool isPasswordBased() const;
</del><ins>+ WEBCORE_EXPORT bool isPasswordBased() const;
</ins><span class="cx">
</span><span class="cx"> bool encodingRequiresPlatformData() const { return false; }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkResourceRequestBaseh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/ResourceRequestBase.h (195508 => 195509)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/ResourceRequestBase.h 2016-01-23 08:19:12 UTC (rev 195508)
+++ trunk/Source/WebCore/platform/network/ResourceRequestBase.h 2016-01-23 09:44:10 UTC (rev 195509)
</span><span class="lines">@@ -65,7 +65,7 @@
</span><span class="cx"> WEBCORE_EXPORT const URL& url() const;
</span><span class="cx"> WEBCORE_EXPORT void setURL(const URL& url);
</span><span class="cx">
</span><del>- void removeCredentials();
</del><ins>+ WEBCORE_EXPORT void removeCredentials();
</ins><span class="cx">
</span><span class="cx"> WEBCORE_EXPORT ResourceRequestCachePolicy cachePolicy() const;
</span><span class="cx"> WEBCORE_EXPORT void setCachePolicy(ResourceRequestCachePolicy cachePolicy);
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (195508 => 195509)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2016-01-23 08:19:12 UTC (rev 195508)
+++ trunk/Source/WebKit2/ChangeLog 2016-01-23 09:44:10 UTC (rev 195509)
</span><span class="lines">@@ -1,3 +1,33 @@
</span><ins>+2016-01-23 Alex Christensen <achristensen@webkit.org>
+
+ Use credentials from a URL with NetworkSession like we did with ResourceHandle
+ https://bugs.webkit.org/show_bug.cgi?id=153328
+
+ Reviewed by Alexey Proskuryakov.
+
+ * NetworkProcess/NetworkLoad.cpp:
+ (WebKit::NetworkLoad::NetworkLoad):
+ createDataTaskWithRequest is being removed, so use std::make_unique<NetworkDataTask> directly instead.
+ Also, create the task even if we are deferring loading. Don't call resume if we are deferring loading.
+ * NetworkProcess/NetworkSession.h:
+ Callbacks are not just used in NetworkSessionTaskClient, so declare them outside.
+ The NetworkDataTask now takes a ResourceRequest so we can strip its credentials.
+ * NetworkProcess/cocoa/NetworkSessionCocoa.mm:
+ (-[WKNetworkSessionDelegate URLSession:task:didReceiveChallenge:completionHandler:]):
+ Try credentials stored with the NetworkDataTask before asking the client for credentials.
+ (WebKit::NetworkSession::~NetworkSession):
+ (WebKit::NetworkSession::dataTaskForIdentifier):
+ (WebKit::NetworkSession::takeDownloadID):
+ (WebKit::NetworkDataTask::NetworkDataTask):
+ Strip the credentials from the url before creating the task because we do not know the authentication type.
+ We will use these credentials when a challenge is received.
+ (WebKit::NetworkDataTask::~NetworkDataTask):
+ (WebKit::NetworkDataTask::tryPasswordBasedAuthentication):
+ If we have credentials from the initial URL, try using them if it is appropriate.
+ (WebKit::NetworkDataTask::cancel):
+ (WebKit::NetworkSession::createDataTaskWithRequest): Deleted.
+ * Shared/Authentication/AuthenticationManager.h:
+
</ins><span class="cx"> 2016-01-22 Dan Bernstein <mitz@apple.com>
</span><span class="cx">
</span><span class="cx"> <rdar://problem/24304228> REGRESSION (r184215): Staged XPC services load non-staged shims
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessNetworkLoadcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/NetworkLoad.cpp (195508 => 195509)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkLoad.cpp 2016-01-23 08:19:12 UTC (rev 195508)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkLoad.cpp 2016-01-23 09:44:10 UTC (rev 195509)
</span><span class="lines">@@ -50,13 +50,12 @@
</span><span class="cx"> , m_currentRequest(parameters.request)
</span><span class="cx"> {
</span><span class="cx"> #if USE(NETWORK_SESSION)
</span><del>- if (!parameters.defersLoading) {
- if (auto* networkSession = SessionTracker::networkSession(parameters.sessionID)) {
- m_task = networkSession->createDataTaskWithRequest(parameters.request, *this);
</del><ins>+ if (auto* networkSession = SessionTracker::networkSession(parameters.sessionID)) {
+ m_task = std::make_unique<NetworkDataTask>(*networkSession, *this, parameters.request);
+ if (!parameters.defersLoading)
</ins><span class="cx"> m_task->resume();
</span><del>- } else
- ASSERT_NOT_REACHED();
- }
</del><ins>+ } else
+ ASSERT_NOT_REACHED();
</ins><span class="cx"> #else
</span><span class="cx"> m_handle = ResourceHandle::create(m_networkingContext.get(), parameters.request, this, parameters.defersLoading, parameters.contentSniffingPolicy == SniffContent);
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessNetworkSessionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/NetworkSession.h (195508 => 195509)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkSession.h 2016-01-23 08:19:12 UTC (rev 195508)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkSession.h 2016-01-23 09:44:10 UTC (rev 195509)
</span><span class="lines">@@ -41,6 +41,7 @@
</span><span class="cx"> #include <wtf/RefCounted.h>
</span><span class="cx"> #include <wtf/RetainPtr.h>
</span><span class="cx"> #include <wtf/WeakPtr.h>
</span><ins>+#include <wtf/text/WTFString.h>
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx"> class AuthenticationChallenge;
</span><span class="lines">@@ -63,13 +64,14 @@
</span><span class="cx"> class NetworkSession;
</span><span class="cx"> class PendingDownload;
</span><span class="cx">
</span><ins>+typedef std::function<void(const WebCore::ResourceRequest&)> RedirectCompletionHandler;
+typedef std::function<void(AuthenticationChallengeDisposition, const WebCore::Credential&)> ChallengeCompletionHandler;
+typedef std::function<void(WebCore::PolicyAction)> ResponseCompletionHandler;
+
</ins><span class="cx"> class NetworkSessionTaskClient {
</span><span class="cx"> public:
</span><del>- typedef std::function<void(const WebCore::ResourceRequest&)> RedirectCompletionHandler;
</del><span class="cx"> virtual void willPerformHTTPRedirection(const WebCore::ResourceResponse&, const WebCore::ResourceRequest&, RedirectCompletionHandler) = 0;
</span><del>- typedef std::function<void(AuthenticationChallengeDisposition, const WebCore::Credential&)> ChallengeCompletionHandler;
</del><span class="cx"> virtual void didReceiveChallenge(const WebCore::AuthenticationChallenge&, ChallengeCompletionHandler) = 0;
</span><del>- typedef std::function<void(WebCore::PolicyAction)> ResponseCompletionHandler;
</del><span class="cx"> virtual void didReceiveResponse(const WebCore::ResourceResponse&, ResponseCompletionHandler) = 0;
</span><span class="cx"> virtual void didReceiveData(RefPtr<WebCore::SharedBuffer>&&) = 0;
</span><span class="cx"> virtual void didCompleteWithError(const WebCore::ResourceError&) = 0;
</span><span class="lines">@@ -81,11 +83,7 @@
</span><span class="cx"> class NetworkDataTask {
</span><span class="cx"> friend class NetworkSession;
</span><span class="cx"> public:
</span><del>-#if PLATFORM(COCOA)
- explicit NetworkDataTask(NetworkSession&, NetworkSessionTaskClient&, RetainPtr<NSURLSessionDataTask>&&);
-#else
- explicit NetworkDataTask(NetworkSession&, NetworkSessionTaskClient&);
-#endif
</del><ins>+ explicit NetworkDataTask(NetworkSession&, NetworkSessionTaskClient&, const WebCore::ResourceRequest&);
</ins><span class="cx">
</span><span class="cx"> void suspend();
</span><span class="cx"> void cancel();
</span><span class="lines">@@ -111,12 +109,15 @@
</span><span class="cx"> ASSERT(!m_pendingDownload);
</span><span class="cx"> m_pendingDownload = &pendingDownload;
</span><span class="cx"> }
</span><ins>+ bool tryPasswordBasedAuthentication(const WebCore::AuthenticationChallenge&, ChallengeCompletionHandler);
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> NetworkSession& m_session;
</span><span class="cx"> NetworkSessionTaskClient& m_client;
</span><span class="cx"> PendingDownload* m_pendingDownload { nullptr };
</span><span class="cx"> DownloadID m_pendingDownloadID;
</span><ins>+ String m_user;
+ String m_password;
</ins><span class="cx"> #if PLATFORM(COCOA)
</span><span class="cx"> RetainPtr<NSURLSessionDataTask> m_task;
</span><span class="cx"> #endif
</span><span class="lines">@@ -133,8 +134,6 @@
</span><span class="cx"> ~NetworkSession();
</span><span class="cx">
</span><span class="cx"> static NetworkSession& defaultSession();
</span><del>-
- std::unique_ptr<NetworkDataTask> createDataTaskWithRequest(const WebCore::ResourceRequest&, NetworkSessionTaskClient&);
</del><span class="cx">
</span><span class="cx"> NetworkDataTask* dataTaskForIdentifier(NetworkDataTask::TaskIdentifier);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesscocoaNetworkSessionCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/cocoa/NetworkSessionCocoa.mm (195508 => 195509)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/cocoa/NetworkSessionCocoa.mm 2016-01-23 08:19:12 UTC (rev 195508)
+++ trunk/Source/WebKit2/NetworkProcess/cocoa/NetworkSessionCocoa.mm 2016-01-23 09:44:10 UTC (rev 195509)
</span><span class="lines">@@ -110,10 +110,16 @@
</span><span class="cx"> {
</span><span class="cx"> if (auto* networkDataTask = _session->dataTaskForIdentifier(task.taskIdentifier)) {
</span><span class="cx"> auto completionHandlerCopy = Block_copy(completionHandler);
</span><del>- networkDataTask->client().didReceiveChallenge(challenge, [completionHandlerCopy](WebKit::AuthenticationChallengeDisposition disposition, const WebCore::Credential& credential) {
</del><ins>+ auto challengeCompletionHandler = [completionHandlerCopy](WebKit::AuthenticationChallengeDisposition disposition, const WebCore::Credential& credential)
+ {
</ins><span class="cx"> completionHandlerCopy(toNSURLSessionAuthChallengeDisposition(disposition), credential.nsCredential());
</span><span class="cx"> Block_release(completionHandlerCopy);
</span><del>- });
</del><ins>+ };
+
+ if (networkDataTask->tryPasswordBasedAuthentication(challenge, challengeCompletionHandler))
+ return;
+
+ networkDataTask->client().didReceiveChallenge(challenge, challengeCompletionHandler);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -229,11 +235,6 @@
</span><span class="cx"> [m_session invalidateAndCancel];
</span><span class="cx"> }
</span><span class="cx">
</span><del>-std::unique_ptr<NetworkDataTask> NetworkSession::createDataTaskWithRequest(const WebCore::ResourceRequest& request, NetworkSessionTaskClient& client)
-{
- return std::make_unique<NetworkDataTask>(*this, client, [m_session dataTaskWithRequest:request.nsURLRequest(WebCore::UpdateHTTPBody)]);
-}
-
</del><span class="cx"> NetworkDataTask* NetworkSession::dataTaskForIdentifier(NetworkDataTask::TaskIdentifier taskIdentifier)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(isMainThread());
</span><span class="lines">@@ -263,13 +264,20 @@
</span><span class="cx"> return downloadID;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-NetworkDataTask::NetworkDataTask(NetworkSession& session, NetworkSessionTaskClient& client, RetainPtr<NSURLSessionDataTask>&& task)
</del><ins>+NetworkDataTask::NetworkDataTask(NetworkSession& session, NetworkSessionTaskClient& client, const WebCore::ResourceRequest& requestWithCredentials)
</ins><span class="cx"> : m_session(session)
</span><span class="cx"> , m_client(client)
</span><del>- , m_task(WTFMove(task))
</del><span class="cx"> {
</span><ins>+ ASSERT(isMainThread());
+
+ auto request = requestWithCredentials;
+ m_user = request.url().user();
+ m_password = request.url().pass();
+ request.removeCredentials();
+
+ m_task = [m_session.m_session dataTaskWithRequest:request.nsURLRequest(WebCore::UpdateHTTPBody)];
+
</ins><span class="cx"> ASSERT(!m_session.m_dataTaskMap.contains(taskIdentifier()));
</span><del>- ASSERT(isMainThread());
</del><span class="cx"> m_session.m_dataTaskMap.add(taskIdentifier(), this);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -281,6 +289,21 @@
</span><span class="cx"> m_session.m_dataTaskMap.remove(taskIdentifier());
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+bool NetworkDataTask::tryPasswordBasedAuthentication(const WebCore::AuthenticationChallenge& challenge, ChallengeCompletionHandler completionHandler)
+{
+ if (!challenge.protectionSpace().isPasswordBased())
+ return false;
+
+ if (!m_user.isNull() && !m_password.isNull()) {
+ completionHandler(AuthenticationChallengeDisposition::UseCredential, WebCore::Credential(m_user, m_password, WebCore::CredentialPersistenceForSession));
+ m_user = String();
+ m_password = String();
+ return true;
+ }
+
+ return false;
+}
+
</ins><span class="cx"> void NetworkDataTask::cancel()
</span><span class="cx"> {
</span><span class="cx"> [m_task cancel];
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedAuthenticationAuthenticationManagerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/Authentication/AuthenticationManager.h (195508 => 195509)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/Authentication/AuthenticationManager.h 2016-01-23 08:19:12 UTC (rev 195508)
+++ trunk/Source/WebKit2/Shared/Authentication/AuthenticationManager.h 2016-01-23 09:44:10 UTC (rev 195509)
</span><span class="lines">@@ -56,7 +56,6 @@
</span><span class="cx"> static const char* supplementName();
</span><span class="cx">
</span><span class="cx"> #if USE(NETWORK_SESSION)
</span><del>- typedef NetworkSessionTaskClient::ChallengeCompletionHandler ChallengeCompletionHandler;
</del><span class="cx"> void didReceiveAuthenticationChallenge(uint64_t pageID, uint64_t frameID, const WebCore::AuthenticationChallenge&, ChallengeCompletionHandler);
</span><span class="cx"> void didReceiveAuthenticationChallenge(PendingDownload&, const WebCore::AuthenticationChallenge&, ChallengeCompletionHandler);
</span><span class="cx"> void continueCanAuthenticateAgainstProtectionSpace(DownloadID, bool canAuthenticate);
</span></span></pre>
</div>
</div>
</body>
</html>