Title: [202882] trunk/Source/WebKit2
- Revision
- 202882
- Author
- [email protected]
- Date
- 2016-07-06 15:39:43 -0700 (Wed, 06 Jul 2016)
Log Message
Call continueCanAuthenticateAgainstProtectionSpace when cancelling loads waiting for the callback
https://bugs.webkit.org/show_bug.cgi?id=159492
<rdar://problem/26921670>
Reviewed by Brady Eidson.
* NetworkProcess/NetworkLoad.cpp:
(WebKit::NetworkLoad::~NetworkLoad):
(WebKit::NetworkLoad::canAuthenticateAgainstProtectionSpaceAsync):
(WebKit::NetworkLoad::continueCanAuthenticateAgainstProtectionSpace):
* NetworkProcess/NetworkLoad.h:
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (202881 => 202882)
--- trunk/Source/WebKit2/ChangeLog 2016-07-06 22:13:18 UTC (rev 202881)
+++ trunk/Source/WebKit2/ChangeLog 2016-07-06 22:39:43 UTC (rev 202882)
@@ -1,3 +1,17 @@
+2016-07-06 Alex Christensen <[email protected]>
+
+ Call continueCanAuthenticateAgainstProtectionSpace when cancelling loads waiting for the callback
+ https://bugs.webkit.org/show_bug.cgi?id=159492
+ <rdar://problem/26921670>
+
+ Reviewed by Brady Eidson.
+
+ * NetworkProcess/NetworkLoad.cpp:
+ (WebKit::NetworkLoad::~NetworkLoad):
+ (WebKit::NetworkLoad::canAuthenticateAgainstProtectionSpaceAsync):
+ (WebKit::NetworkLoad::continueCanAuthenticateAgainstProtectionSpace):
+ * NetworkProcess/NetworkLoad.h:
+
2016-07-06 Myles C. Maxfield <[email protected]>
[RTL Scrollbars] RTL Scrollbars broken with clients creating Web Views via [WKView initWithFrame:contextRef:pageGroupRef:]
Modified: trunk/Source/WebKit2/NetworkProcess/NetworkLoad.cpp (202881 => 202882)
--- trunk/Source/WebKit2/NetworkProcess/NetworkLoad.cpp 2016-07-06 22:13:18 UTC (rev 202881)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkLoad.cpp 2016-07-06 22:39:43 UTC (rev 202882)
@@ -79,6 +79,9 @@
m_challengeCompletionHandler(AuthenticationChallengeDisposition::Cancel, { });
if (m_task)
m_task->clearClient();
+#elif USE(PROTECTION_SPACE_AUTH_CALLBACK)
+ if (m_handle && m_waitingForContinueCanAuthenticateAgainstProtectionSpace)
+ m_handle->continueCanAuthenticateAgainstProtectionSpace(false);
#endif
if (m_handle)
m_handle->clearClient();
@@ -334,6 +337,9 @@
return;
}
+#if !USE(NETWORK_SESSION)
+ m_waitingForContinueCanAuthenticateAgainstProtectionSpace = true;
+#endif
m_client.canAuthenticateAgainstProtectionSpaceAsync(protectionSpace);
}
#endif
@@ -364,6 +370,8 @@
else
NetworkProcess::singleton().authenticationManager().didReceiveAuthenticationChallenge(m_parameters.webPageID, m_parameters.webFrameID, *m_challenge, WTFMove(completionHandler));
}
+#else
+ m_waitingForContinueCanAuthenticateAgainstProtectionSpace = false;
#endif
if (m_handle)
m_handle->continueCanAuthenticateAgainstProtectionSpace(result);
Modified: trunk/Source/WebKit2/NetworkProcess/NetworkLoad.h (202881 => 202882)
--- trunk/Source/WebKit2/NetworkProcess/NetworkLoad.h 2016-07-06 22:13:18 UTC (rev 202881)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkLoad.h 2016-07-06 22:39:43 UTC (rev 202882)
@@ -128,6 +128,7 @@
ResponseCompletionHandler m_responseCompletionHandler;
RedirectCompletionHandler m_redirectCompletionHandler;
#else
+ bool m_waitingForContinueCanAuthenticateAgainstProtectionSpace { false };
RefPtr<RemoteNetworkingContext> m_networkingContext;
#endif
RefPtr<WebCore::ResourceHandle> m_handle;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
