Title: [202119] trunk/Source/WebKit2
- Revision
- 202119
- Author
- achristen...@apple.com
- Date
- 2016-06-15 18:28:54 -0700 (Wed, 15 Jun 2016)
Log Message
Revert part of r196034
https://bugs.webkit.org/show_bug.cgi?id=158805
rdar://problem/26788138
Reviewed by Dan Bernstein.
* NetworkProcess/NetworkLoad.cpp:
(WebKit::NetworkLoad::~NetworkLoad):
If the WebResourceLoader was destroyed and received a canAuthenticateAgainstProtectionSpace
but did not send a continueCanAuthenticateAgainstProtectionSpace answer because there's no
core loader, then the NetworkLoad will be destroyed. When this happens, we still need to call
the callback for the challenge.
* WebProcess/Network/WebResourceLoader.cpp:
(WebKit::WebResourceLoader::canAuthenticateAgainstProtectionSpace):
If there's no core loader, we can't send IPC.
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (202118 => 202119)
--- trunk/Source/WebKit2/ChangeLog 2016-06-16 01:22:54 UTC (rev 202118)
+++ trunk/Source/WebKit2/ChangeLog 2016-06-16 01:28:54 UTC (rev 202119)
@@ -1,3 +1,21 @@
+2016-06-15 Alex Christensen <achristen...@webkit.org>
+
+ Revert part of r196034
+ https://bugs.webkit.org/show_bug.cgi?id=158805
+ rdar://problem/26788138
+
+ Reviewed by Dan Bernstein.
+
+ * NetworkProcess/NetworkLoad.cpp:
+ (WebKit::NetworkLoad::~NetworkLoad):
+ If the WebResourceLoader was destroyed and received a canAuthenticateAgainstProtectionSpace
+ but did not send a continueCanAuthenticateAgainstProtectionSpace answer because there's no
+ core loader, then the NetworkLoad will be destroyed. When this happens, we still need to call
+ the callback for the challenge.
+ * WebProcess/Network/WebResourceLoader.cpp:
+ (WebKit::WebResourceLoader::canAuthenticateAgainstProtectionSpace):
+ If there's no core loader, we can't send IPC.
+
2016-06-13 Simon Fraser <simon.fra...@apple.com>
[iOS WK2] Make it possible to test the Next/Previous buttons in the keyboard accessory bar
Modified: trunk/Source/WebKit2/NetworkProcess/NetworkLoad.cpp (202118 => 202119)
--- trunk/Source/WebKit2/NetworkProcess/NetworkLoad.cpp 2016-06-16 01:22:54 UTC (rev 202118)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkLoad.cpp 2016-06-16 01:28:54 UTC (rev 202119)
@@ -75,6 +75,8 @@
#if USE(NETWORK_SESSION)
if (m_responseCompletionHandler)
m_responseCompletionHandler(PolicyIgnore);
+ if (m_challengeCompletionHandler)
+ m_challengeCompletionHandler(AuthenticationChallengeDisposition::Cancel, { });
if (m_task)
m_task->clearClient();
#endif
Modified: trunk/Source/WebKit2/WebProcess/Network/WebResourceLoader.cpp (202118 => 202119)
--- trunk/Source/WebKit2/WebProcess/Network/WebResourceLoader.cpp 2016-06-16 01:22:54 UTC (rev 202118)
+++ trunk/Source/WebKit2/WebProcess/Network/WebResourceLoader.cpp 2016-06-16 01:28:54 UTC (rev 202119)
@@ -214,8 +214,11 @@
#if USE(PROTECTION_SPACE_AUTH_CALLBACK)
void WebResourceLoader::canAuthenticateAgainstProtectionSpace(const ProtectionSpace& protectionSpace)
{
- bool result = m_coreLoader ? m_coreLoader->canAuthenticateAgainstProtectionSpace(protectionSpace) : false;
-
+ if (!m_coreLoader)
+ return;
+
+ bool result = m_coreLoader->canAuthenticateAgainstProtectionSpace(protectionSpace);
+
send(Messages::NetworkResourceLoader::ContinueCanAuthenticateAgainstProtectionSpace(result));
}
#endif
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
