Title: [147460] tags/Safari-537.35.6/Source
- Revision
- 147460
- Author
- [email protected]
- Date
- 2013-04-02 11:04:04 -0700 (Tue, 02 Apr 2013)
Log Message
Merged r147359. <rdar://problem/13549181>
Modified Paths
Diff
Modified: tags/Safari-537.35.6/Source/WebCore/ChangeLog (147459 => 147460)
--- tags/Safari-537.35.6/Source/WebCore/ChangeLog 2013-04-02 18:02:21 UTC (rev 147459)
+++ tags/Safari-537.35.6/Source/WebCore/ChangeLog 2013-04-02 18:04:04 UTC (rev 147460)
@@ -1,5 +1,21 @@
2013-04-01 Lucas Forschler <[email protected]>
+ Merge r147359
+
+ 2013-04-01 Alexey Proskuryakov <[email protected]>
+
+ https://bugs.webkit.org/show_bug.cgi?id=113721
+ <rdar://problem/13549181> REGRESSION (r146929): HTTP auth credentials not reused during session
+
+ Reviewed by Brady Eidson.
+
+ * platform/network/mac/ResourceHandleMac.mm:
+ (WebCore::ResourceHandle::start):
+ (WebCore::ResourceHandle::didReceiveAuthenticationChallenge):
+ Added FIXMEs.
+
+2013-04-01 Lucas Forschler <[email protected]>
+
Merge r147260
2013-03-29 Alexey Proskuryakov <[email protected]>
Modified: tags/Safari-537.35.6/Source/WebCore/platform/network/mac/ResourceHandleMac.mm (147459 => 147460)
--- tags/Safari-537.35.6/Source/WebCore/platform/network/mac/ResourceHandleMac.mm 2013-04-02 18:02:21 UTC (rev 147459)
+++ tags/Safari-537.35.6/Source/WebCore/platform/network/mac/ResourceHandleMac.mm 2013-04-02 18:04:04 UTC (rev 147460)
@@ -175,6 +175,7 @@
d->m_proxy.adoptNS(wkCreateNSURLConnectionDelegateProxy());
[static_cast<WebCoreNSURLConnectionDelegateProxy*>(d->m_proxy.get()) setDelegate:ResourceHandle::delegate()];
+ // FIXME: Do not use the sync version of shouldUseCredentialStorage when the client returns true from usesAsyncCallbacks.
bool shouldUseCredentialStorage = !client() || client()->shouldUseCredentialStorage(this);
d->m_needsSiteSpecificQuirks = d->m_context->needsSiteSpecificQuirks();
@@ -475,6 +476,7 @@
return;
}
+ // FIXME: Do not use the sync version of shouldUseCredentialStorage when the client returns true from usesAsyncCallbacks.
if (!client() || client()->shouldUseCredentialStorage(this)) {
if (!d->m_initialCredential.isEmpty() || challenge.previousFailureCount()) {
// The stored credential wasn't accepted, stop using it.
Modified: tags/Safari-537.35.6/Source/WebKit2/ChangeLog (147459 => 147460)
--- tags/Safari-537.35.6/Source/WebKit2/ChangeLog 2013-04-02 18:02:21 UTC (rev 147459)
+++ tags/Safari-537.35.6/Source/WebKit2/ChangeLog 2013-04-02 18:04:04 UTC (rev 147460)
@@ -1,5 +1,23 @@
2013-04-01 Lucas Forschler <[email protected]>
+ Merge r147359
+
+ 2013-04-01 Alexey Proskuryakov <[email protected]>
+
+ https://bugs.webkit.org/show_bug.cgi?id=113721
+ <rdar://problem/13549181> REGRESSION (r146929): HTTP auth credentials not reused during session
+
+ Reviewed by Brady Eidson.
+
+ * NetworkProcess/NetworkResourceLoader.h:
+ * NetworkProcess/NetworkResourceLoader.cpp:
+ (WebKit::NetworkResourceLoader::shouldUseCredentialStorage): Added an override that
+ we still need. It's not great, but causes no trouble for NetworkProcess.
+ (WebKit::NetworkResourceLoader::shouldUseCredentialStorageAsync): Implement in
+ terms of sync version to avoid duplicating logic.
+
+2013-04-01 Lucas Forschler <[email protected]>
+
Merge r147260
2013-03-29 Alexey Proskuryakov <[email protected]>
Modified: tags/Safari-537.35.6/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp (147459 => 147460)
--- tags/Safari-537.35.6/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp 2013-04-02 18:02:21 UTC (rev 147459)
+++ tags/Safari-537.35.6/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp 2013-04-02 18:04:04 UTC (rev 147460)
@@ -300,14 +300,21 @@
notImplemented();
}
-void NetworkResourceLoader::shouldUseCredentialStorageAsync(ResourceHandle* handle)
+bool NetworkResourceLoader::shouldUseCredentialStorage(WebCore::ResourceHandle*)
{
// When the WebProcess is handling loading a client is consulted each time this shouldUseCredentialStorage question is asked.
// In NetworkProcess mode we ask the WebProcess client up front once and then reuse the cached answer.
- handle->continueShouldUseCredentialStorage(allowStoredCredentials() == AllowStoredCredentials);
+ // We still need this sync version, because ResourceHandle itself uses it internally, even when the delegate uses an async one.
+
+ return allowStoredCredentials() == AllowStoredCredentials;
}
+void NetworkResourceLoader::shouldUseCredentialStorageAsync(ResourceHandle* handle)
+{
+ handle->continueShouldUseCredentialStorage(shouldUseCredentialStorage(handle));
+}
+
void NetworkResourceLoader::didReceiveAuthenticationChallenge(ResourceHandle*, const AuthenticationChallenge& challenge)
{
NetworkProcess::shared().authenticationManager().didReceiveAuthenticationChallenge(webPageID(), webFrameID(), challenge);
Modified: tags/Safari-537.35.6/Source/WebKit2/NetworkProcess/NetworkResourceLoader.h (147459 => 147460)
--- tags/Safari-537.35.6/Source/WebKit2/NetworkProcess/NetworkResourceLoader.h 2013-04-02 18:02:21 UTC (rev 147459)
+++ tags/Safari-537.35.6/Source/WebKit2/NetworkProcess/NetworkResourceLoader.h 2013-04-02 18:04:04 UTC (rev 147460)
@@ -75,6 +75,7 @@
virtual void didFail(WebCore::ResourceHandle*, const WebCore::ResourceError&) OVERRIDE;
virtual void wasBlocked(WebCore::ResourceHandle*) OVERRIDE;
virtual void cannotShowURL(WebCore::ResourceHandle*) OVERRIDE;
+ virtual bool shouldUseCredentialStorage(WebCore::ResourceHandle*) OVERRIDE;
virtual void shouldUseCredentialStorageAsync(WebCore::ResourceHandle*) OVERRIDE;
virtual void didReceiveAuthenticationChallenge(WebCore::ResourceHandle*, const WebCore::AuthenticationChallenge&) OVERRIDE;
virtual void didCancelAuthenticationChallenge(WebCore::ResourceHandle*, const WebCore::AuthenticationChallenge&) OVERRIDE;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
