Title: [227486] releases/WebKitGTK/webkit-2.18/Source/WebKit
- Revision
- 227486
- Author
- carlo...@webkit.org
- Date
- 2018-01-24 01:36:39 -0800 (Wed, 24 Jan 2018)
Log Message
Merge r224135 - Attempt to fix the Apple El Capitan build following <https://trac.webkit.org/changeset/224134>
(https://bugs.webkit.org/show_bug.cgi?id=178919)
Move definition of NetworkLoad::isAllowedToAskUserForCredentials() outside of USE(NETWORK_SESSION)-guarded section.
* NetworkProcess/NetworkLoad.cpp:
(WebKit::NetworkLoad::isAllowedToAskUserForCredentials const):
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.18/Source/WebKit/ChangeLog (227485 => 227486)
--- releases/WebKitGTK/webkit-2.18/Source/WebKit/ChangeLog 2018-01-24 09:36:32 UTC (rev 227485)
+++ releases/WebKitGTK/webkit-2.18/Source/WebKit/ChangeLog 2018-01-24 09:36:39 UTC (rev 227486)
@@ -1,5 +1,15 @@
2017-10-27 Daniel Bates <daba...@apple.com>
+ Attempt to fix the Apple El Capitan build following <https://trac.webkit.org/changeset/224134>
+ (https://bugs.webkit.org/show_bug.cgi?id=178919)
+
+ Move definition of NetworkLoad::isAllowedToAskUserForCredentials() outside of USE(NETWORK_SESSION)-guarded section.
+
+ * NetworkProcess/NetworkLoad.cpp:
+ (WebKit::NetworkLoad::isAllowedToAskUserForCredentials const):
+
+2017-10-27 Daniel Bates <daba...@apple.com>
+
Only allow non-mixed content protected subresources to ask for credentials
https://bugs.webkit.org/show_bug.cgi?id=178919
<rdar://problem/35015245>
Modified: releases/WebKitGTK/webkit-2.18/Source/WebKit/NetworkProcess/NetworkLoad.cpp (227485 => 227486)
--- releases/WebKitGTK/webkit-2.18/Source/WebKit/NetworkProcess/NetworkLoad.cpp 2018-01-24 09:36:32 UTC (rev 227485)
+++ releases/WebKitGTK/webkit-2.18/Source/WebKit/NetworkProcess/NetworkLoad.cpp 2018-01-24 09:36:39 UTC (rev 227486)
@@ -268,6 +268,11 @@
m_client.get().willSendRedirectedRequest(WTFMove(oldRequest), WTFMove(request), WTFMove(redirectResponse));
}
+bool NetworkLoad::isAllowedToAskUserForCredentials() const
+{
+ return m_client.get().isAllowedToAskUserForCredentials();
+}
+
#if USE(NETWORK_SESSION)
void NetworkLoad::convertTaskToDownload(PendingDownload& pendingDownload, const ResourceRequest& updatedRequest, const ResourceResponse& response)
@@ -337,11 +342,6 @@
#endif
}
-bool NetworkLoad::isAllowedToAskUserForCredentials() const
-{
- return m_client.get().isAllowedToAskUserForCredentials();
-}
-
void NetworkLoad::completeAuthenticationChallenge(ChallengeCompletionHandler&& completionHandler)
{
bool isServerTrustEvaluation = m_challenge->protectionSpace().authenticationScheme() == ProtectionSpaceAuthenticationSchemeServerTrustEvaluationRequested;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
