Title: [211754] trunk/Source
Revision
211754
Author
achristen...@apple.com
Date
2017-02-06 15:47:26 -0800 (Mon, 06 Feb 2017)

Log Message

More build fixes after r211751
https://bugs.webkit.org/show_bug.cgi?id=166998

Source/WebCore:

* platform/network/soup/ResourceHandleSoup.cpp:
(WebCore::applyAuthenticationToRequest):
* platform/network/soup/SocketStreamHandleImplSoup.cpp:
(WebCore::SocketStreamHandleImpl::create):

Source/WebKit/win:

* WebDownloadCFNet.cpp:
(WebDownload::didReceiveAuthenticationChallenge):

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (211753 => 211754)


--- trunk/Source/WebCore/ChangeLog	2017-02-06 23:27:48 UTC (rev 211753)
+++ trunk/Source/WebCore/ChangeLog	2017-02-06 23:47:26 UTC (rev 211754)
@@ -1,5 +1,15 @@
 2017-02-06  Alex Christensen  <achristen...@webkit.org>
 
+        More build fixes after r211751
+        https://bugs.webkit.org/show_bug.cgi?id=166998
+
+        * platform/network/soup/ResourceHandleSoup.cpp:
+        (WebCore::applyAuthenticationToRequest):
+        * platform/network/soup/SocketStreamHandleImplSoup.cpp:
+        (WebCore::SocketStreamHandleImpl::create):
+
+2017-02-06  Alex Christensen  <achristen...@webkit.org>
+
         Fix non-cocoa builds after r211751.
         https://bugs.webkit.org/show_bug.cgi?id=166998
 

Modified: trunk/Source/WebCore/platform/network/soup/ResourceHandleSoup.cpp (211753 => 211754)


--- trunk/Source/WebCore/platform/network/soup/ResourceHandleSoup.cpp	2017-02-06 23:27:48 UTC (rev 211753)
+++ trunk/Source/WebCore/platform/network/soup/ResourceHandleSoup.cpp	2017-02-06 23:47:26 UTC (rev 211754)
@@ -209,7 +209,7 @@
 
     if (handle->shouldUseCredentialStorage()) {
         if (d->m_user.isEmpty() && d->m_pass.isEmpty())
-            d->m_initialCredential = CredentialStorage::defaultCredentialStorage().get(request.url());
+            d->m_initialCredential = CredentialStorage::defaultCredentialStorage().get(partition, request.url());
         else if (!redirect) {
             // If there is already a protection space known for the URL, update stored credentials
             // before sending a request. This makes it possible to implement logout by sending an

Modified: trunk/Source/WebCore/platform/network/soup/SocketStreamHandleImplSoup.cpp (211753 => 211754)


--- trunk/Source/WebCore/platform/network/soup/SocketStreamHandleImplSoup.cpp	2017-02-06 23:27:48 UTC (rev 211753)
+++ trunk/Source/WebCore/platform/network/soup/SocketStreamHandleImplSoup.cpp	2017-02-06 23:47:26 UTC (rev 211754)
@@ -48,7 +48,7 @@
 
 namespace WebCore {
 
-Ref<SocketStreamHandleImpl> SocketStreamHandleImpl::create(const URL& url, SocketStreamHandleClient& client, SessionID)
+Ref<SocketStreamHandleImpl> SocketStreamHandleImpl::create(const URL& url, SocketStreamHandleClient& client, SessionID, const String&)
 {
     Ref<SocketStreamHandleImpl> socket = adoptRef(*new SocketStreamHandleImpl(url, client));
 

Modified: trunk/Source/WebKit/win/ChangeLog (211753 => 211754)


--- trunk/Source/WebKit/win/ChangeLog	2017-02-06 23:27:48 UTC (rev 211753)
+++ trunk/Source/WebKit/win/ChangeLog	2017-02-06 23:47:26 UTC (rev 211754)
@@ -1,3 +1,11 @@
+2017-02-06  Alex Christensen  <achristen...@webkit.org>
+
+        More build fixes after r211751
+        https://bugs.webkit.org/show_bug.cgi?id=166998
+
+        * WebDownloadCFNet.cpp:
+        (WebDownload::didReceiveAuthenticationChallenge):
+
 2017-02-06  Said Abou-Hallawa  <sabouhall...@apple.com>
 
         Rename AnimationController to CSSAnimationController

Modified: trunk/Source/WebKit/win/WebDownloadCFNet.cpp (211753 => 211754)


--- trunk/Source/WebKit/win/WebDownloadCFNet.cpp	2017-02-06 23:27:48 UTC (rev 211753)
+++ trunk/Source/WebKit/win/WebDownloadCFNet.cpp	2017-02-06 23:47:26 UTC (rev 211754)
@@ -376,7 +376,7 @@
 {
     // Try previously stored credential first.
     if (!CFURLAuthChallengeGetPreviousFailureCount(challenge)) {
-        Credential credential = CredentialStorage::defaultCredentialStorage().get(core(CFURLAuthChallengeGetProtectionSpace(challenge)));
+        Credential credential = CredentialStorage::defaultCredentialStorage().get(emptyString(), core(CFURLAuthChallengeGetProtectionSpace(challenge)));
         if (!credential.isEmpty()) {
             RetainPtr<CFURLCredentialRef> cfCredential = adoptCF(createCF(credential));
             CFURLDownloadUseCredential(m_download.get(), cfCredential.get(), challenge);
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to