Title: [232233] trunk/Source
- Revision
- 232233
- Author
- [email protected]
- Date
- 2018-05-27 20:21:52 -0700 (Sun, 27 May 2018)
Log Message
REGRESSION(r232198) [WinCairo] cannot convert from 'WTF::StringView' to 'const WTF::String'
https://bugs.webkit.org/show_bug.cgi?id=186027
Unreviewed build fix
Source/WebCore:
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):
Source/WebKitLegacy/win:
* WebMutableURLRequest.cpp:
(WebMutableURLRequest::setAllowsAnyHTTPSCertificate):
(WebMutableURLRequest::setClientCertificate):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (232232 => 232233)
--- trunk/Source/WebCore/ChangeLog 2018-05-28 03:19:37 UTC (rev 232232)
+++ trunk/Source/WebCore/ChangeLog 2018-05-28 03:21:52 UTC (rev 232233)
@@ -1,3 +1,18 @@
+2018-05-27 Fujii Hironori <[email protected]>
+
+ 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 <[email protected]>
Modernize RenderStyleConstants.h - Part 3
Modified: trunk/Source/WebCore/platform/network/curl/AuthenticationChallengeCurl.cpp (232232 => 232233)
--- trunk/Source/WebCore/platform/network/curl/AuthenticationChallengeCurl.cpp 2018-05-28 03:19:37 UTC (rev 232232)
+++ trunk/Source/WebCore/platform/network/curl/AuthenticationChallengeCurl.cpp 2018-05-28 03:21:52 UTC (rev 232233)
@@ -76,7 +76,7 @@
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)
Modified: trunk/Source/WebCore/platform/network/curl/CurlRequest.cpp (232232 => 232233)
--- trunk/Source/WebCore/platform/network/curl/CurlRequest.cpp 2018-05-28 03:19:37 UTC (rev 232232)
+++ trunk/Source/WebCore/platform/network/curl/CurlRequest.cpp 2018-05-28 03:21:52 UTC (rev 232233)
@@ -226,7 +226,7 @@
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 @@
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;
}
Modified: trunk/Source/WebKitLegacy/win/ChangeLog (232232 => 232233)
--- trunk/Source/WebKitLegacy/win/ChangeLog 2018-05-28 03:19:37 UTC (rev 232232)
+++ trunk/Source/WebKitLegacy/win/ChangeLog 2018-05-28 03:21:52 UTC (rev 232233)
@@ -1,3 +1,14 @@
+2018-05-27 Fujii Hironori <[email protected]>
+
+ 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 <[email protected]>
Minor ApplicationCacheStorage clean up
Modified: trunk/Source/WebKitLegacy/win/WebMutableURLRequest.cpp (232232 => 232233)
--- trunk/Source/WebKitLegacy/win/WebMutableURLRequest.cpp 2018-05-28 03:19:37 UTC (rev 232232)
+++ trunk/Source/WebKitLegacy/win/WebMutableURLRequest.cpp 2018-05-28 03:21:52 UTC (rev 232233)
@@ -356,7 +356,7 @@
HRESULT WebMutableURLRequest::setAllowsAnyHTTPSCertificate()
{
- ResourceHandle::setHostAllowsAnyHTTPSCertificate(m_request.url().host());
+ ResourceHandle::setHostAllowsAnyHTTPSCertificate(m_request.url().host().toString());
return S_OK;
}
@@ -368,7 +368,7 @@
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;
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
