Attachment 341441 Details for Bug 186027 – Patch

[patch] Patch

bug-186027-20180528121923.patch (text/plain), 4.90 KB, created by Fujii Hironori on 2018-05-27 20:19:24 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Fujii Hironori

Created: 2018-05-27 20:19:24 PDT

Size: 4.90 KB

patch

obsolete

>Subversion Revision: 232230
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index dccb75fadd6b91a0bc731fdee8de675589056290..36d0f2dd68695c62c5b564f7045c01769514d16a 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,18 @@
>+2018-05-27  Fujii Hironori  <Hironori.Fujii@sony.com>
>+
>+        REGRESSION(r232198) [WinCairo] cannot convert from 'WTF::StringView' to 'const WTF::String'
>+        https://bugs.webkit.org/show_bug.cgi?id=186027
>+
>+        Unreviewed build fix
>+
>+        No new tests (No behavior change).
>+
>+        * platform/network/curl/AuthenticationChallengeCurl.cpp:
>+        (WebCore::AuthenticationChallenge::protectionSpaceFromHandle):
>+        * platform/network/curl/CurlRequest.cpp:
>+        (WebCore::CurlRequest::setupTransfer):
>+        (WebCore::CurlRequest::willSetupSslCtx):
>+
> 2018-05-27  Sam Weinig  <sam@webkit.org>
> 
>         Modernize RenderStyleConstants.h - Part 3
>diff --git a/Source/WebKitLegacy/win/ChangeLog b/Source/WebKitLegacy/win/ChangeLog
>index ce535f41a9f48dbce13ee21364a1950905511ef9..18b047d43da383a50c20bbc64d1e60519e68d14b 100644
>--- a/Source/WebKitLegacy/win/ChangeLog
>+++ b/Source/WebKitLegacy/win/ChangeLog
>@@ -1,3 +1,14 @@
>+2018-05-27  Fujii Hironori  <Hironori.Fujii@sony.com>
>+
>+        REGRESSION(r232198) [WinCairo] cannot convert from 'WTF::StringView' to 'const WTF::String'
>+        https://bugs.webkit.org/show_bug.cgi?id=186027
>+
>+        Unreviewed build fix
>+
>+        * WebMutableURLRequest.cpp:
>+        (WebMutableURLRequest::setAllowsAnyHTTPSCertificate):
>+        (WebMutableURLRequest::setClientCertificate):
>+
> 2018-05-25  Chris Dumez  <cdumez@apple.com>
> 
>         Minor ApplicationCacheStorage clean up
>diff --git a/Source/WebCore/platform/network/curl/AuthenticationChallengeCurl.cpp b/Source/WebCore/platform/network/curl/AuthenticationChallengeCurl.cpp
>index cee36b41b017b50a39f0a1ee2cee235c1994ce62..a3069e53a1a28282e1108809e14445b5a5527d12 100644
>--- a/Source/WebCore/platform/network/curl/AuthenticationChallengeCurl.cpp
>+++ b/Source/WebCore/platform/network/curl/AuthenticationChallengeCurl.cpp
>@@ -76,7 +76,7 @@ ProtectionSpace AuthenticationChallenge::protectionSpaceFromHandle(const CurlRes
>         removeLeadingAndTrailingQuotes(realm);
>     }
> 
>-    return ProtectionSpace(response.url().host(), static_cast<int>(port), protectionSpaceServerTypeFromURI(response.url()), realm, scheme);
>+    return ProtectionSpace(response.url().host().toString(), static_cast<int>(port), protectionSpaceServerTypeFromURI(response.url()), realm, scheme);
> }
> 
> void AuthenticationChallenge::removeLeadingAndTrailingQuotes(String& value)
>diff --git a/Source/WebCore/platform/network/curl/CurlRequest.cpp b/Source/WebCore/platform/network/curl/CurlRequest.cpp
>index 026e8d29d5435129e1325b3b800372bc4bd24004..5aa728c97065e62cb5b178627222bb18cc1fd96d 100644
>--- a/Source/WebCore/platform/network/curl/CurlRequest.cpp
>+++ b/Source/WebCore/platform/network/curl/CurlRequest.cpp
>@@ -226,7 +226,7 @@ CURL* CurlRequest::setupTransfer()
>     if (!cipherList.isEmpty())
>         m_curlHandle->setSslCipherList(cipherList.utf8().data());
> 
>-    auto sslClientCertificate = sslHandle.getSSLClientCertificate(m_request.url().host());
>+    auto sslClientCertificate = sslHandle.getSSLClientCertificate(m_request.url().host().toString());
>     if (sslClientCertificate) {
>         m_curlHandle->setSslCert(sslClientCertificate->first.utf8().data());
>         m_curlHandle->setSslCertType("P12");
>@@ -252,7 +252,7 @@ CURLcode CurlRequest::willSetupSslCtx(void* sslCtx)
>         return CURLE_ABORTED_BY_CALLBACK;
> 
>     if (!m_sslVerifier)
>-        m_sslVerifier = std::make_unique<CurlSSLVerifier>(m_curlHandle.get(), m_request.url().host(), sslCtx);
>+        m_sslVerifier = std::make_unique<CurlSSLVerifier>(m_curlHandle.get(), m_request.url().host().toString(), sslCtx);
>     return CURLE_OK;
> }
> 
>diff --git a/Source/WebKitLegacy/win/WebMutableURLRequest.cpp b/Source/WebKitLegacy/win/WebMutableURLRequest.cpp
>index 3f36f2ec7b3d51a744b0c9a347908d7cca2c44f3..e07241ebe555877d9c50abb66d932f51569e18f5 100644
>--- a/Source/WebKitLegacy/win/WebMutableURLRequest.cpp
>+++ b/Source/WebKitLegacy/win/WebMutableURLRequest.cpp
>@@ -356,7 +356,7 @@ HRESULT WebMutableURLRequest::setValue(_In_ BSTR value, _In_ BSTR field)
> 
> HRESULT WebMutableURLRequest::setAllowsAnyHTTPSCertificate()
> {
>-    ResourceHandle::setHostAllowsAnyHTTPSCertificate(m_request.url().host());
>+    ResourceHandle::setHostAllowsAnyHTTPSCertificate(m_request.url().host().toString());
> 
>     return S_OK;
> }
>@@ -368,7 +368,7 @@ HRESULT WebMutableURLRequest::setClientCertificate(ULONG_PTR cert)
> 
>     PCCERT_CONTEXT certContext = reinterpret_cast<PCCERT_CONTEXT>(cert);
>     RetainPtr<CFDataRef> certData = WebCore::copyCertificateToData(certContext);
>-    ResourceHandle::setClientCertificate(m_request.url().host(), certData.get());
>+    ResourceHandle::setClientCertificate(m_request.url().host().toString(), certData.get());
>     return S_OK;
> }
>

Actions: View | Formatted Diff | Diff

Attachments on bug 186027: 341441