Modified: trunk/Source/WebKit2/ChangeLog (211756 => 211757)
--- trunk/Source/WebKit2/ChangeLog 2017-02-06 23:50:39 UTC (rev 211756)
+++ trunk/Source/WebKit2/ChangeLog 2017-02-06 23:56:09 UTC (rev 211757)
@@ -1,3 +1,15 @@
+2017-02-06 Alex Christensen <[email protected]>
+
+ More build fixes after r211751
+ https://bugs.webkit.org/show_bug.cgi?id=166998
+
+ * NetworkProcess/soup/NetworkDataTaskSoup.cpp:
+ (WebKit::NetworkDataTaskSoup::NetworkDataTaskSoup):
+ (WebKit::NetworkDataTaskSoup::authenticate):
+ (WebKit::NetworkDataTaskSoup::continueAuthenticate):
+ (WebKit::NetworkDataTaskSoup::continueHTTPRedirection):
+ Use the correct partition for credentials.
+
2017-02-06 Jer Noble <[email protected]>
Update sandbox to allow CoreMedia to perform custom media loading.
Modified: trunk/Source/WebKit2/NetworkProcess/soup/NetworkDataTaskSoup.cpp (211756 => 211757)
--- trunk/Source/WebKit2/NetworkProcess/soup/NetworkDataTaskSoup.cpp 2017-02-06 23:50:39 UTC (rev 211756)
+++ trunk/Source/WebKit2/NetworkProcess/soup/NetworkDataTaskSoup.cpp 2017-02-06 23:56:09 UTC (rev 211757)
@@ -68,9 +68,9 @@
request.removeCredentials();
if (m_user.isEmpty() && m_password.isEmpty())
- m_initialCredential = m_session->networkStorageSession().credentialStorage().get(request.url());
+ m_initialCredential = m_session->networkStorageSession().credentialStorage().get(m_partition, request.url());
else
- m_session->networkStorageSession().credentialStorage().set(Credential(m_user, m_password, CredentialPersistenceNone), request.url());
+ m_session->networkStorageSession().credentialStorage().set(m_partition, Credential(m_user, m_password, CredentialPersistenceNone), request.url());
}
applyAuthenticationToRequest(request);
}
@@ -448,17 +448,17 @@
// The stored credential wasn't accepted, stop using it. There is a race condition
// here, since a different credential might have already been stored by another
// NetworkDataTask, but the observable effect should be very minor, if any.
- m_session->networkStorageSession().credentialStorage().remove(challenge.protectionSpace());
+ m_session->networkStorageSession().credentialStorage().remove(m_partition, challenge.protectionSpace());
}
if (!challenge.previousFailureCount()) {
- auto credential = m_session->networkStorageSession().credentialStorage().get(challenge.protectionSpace());
+ auto credential = m_session->networkStorageSession().credentialStorage().get(m_partition, challenge.protectionSpace());
if (!credential.isEmpty() && credential != m_initialCredential) {
ASSERT(credential.persistence() == CredentialPersistenceNone);
if (isAuthenticationFailureStatusCode(challenge.failureResponse().httpStatusCode())) {
// Store the credential back, possibly adding it as a default for this directory.
- m_session->networkStorageSession().credentialStorage().set(credential, challenge.protectionSpace(), challenge.failureResponse().url());
+ m_session->networkStorageSession().credentialStorage().set(m_partition, credential, challenge.protectionSpace(), challenge.failureResponse().url());
}
soup_auth_authenticate(challenge.soupAuth(), credential.user().utf8().data(), credential.password().utf8().data());
return;
@@ -509,7 +509,7 @@
// we place the credentials in the store even though libsoup will never fire the authenticate signal again for
// this protection space.
if (credential.persistence() == CredentialPersistenceForSession || credential.persistence() == CredentialPersistencePermanent)
- m_session->networkStorageSession().credentialStorage().set(credential, challenge.protectionSpace(), challenge.failureResponse().url());
+ m_session->networkStorageSession().credentialStorage().set(m_partition, credential, challenge.protectionSpace(), challenge.failureResponse().url());
if (credential.persistence() == CredentialPersistencePermanent) {
m_protectionSpaceForPersistentStorage = challenge.protectionSpace();
@@ -639,7 +639,7 @@
request.clearHTTPOrigin();
} else if (url.protocolIsInHTTPFamily() && m_storedCredentials == AllowStoredCredentials) {
if (m_user.isEmpty() && m_password.isEmpty()) {
- auto credential = m_session->networkStorageSession().credentialStorage().get(request.url());
+ auto credential = m_session->networkStorageSession().credentialStorage().get(m_partition, request.url());
if (!credential.isEmpty())
m_initialCredential = credential;
}
