Title: [232292] trunk/Source/WebCore
- Revision
- 232292
- Author
- a...@apple.com
- Date
- 2018-05-30 08:47:41 -0700 (Wed, 30 May 2018)
Log Message
Build fix attempt after https://trac.webkit.org/r232198
* platform/network/cf/ResourceHandleCFNet.cpp:
(WebCore::ResourceHandle::createCFURLConnection): Added some toString() calls.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (232291 => 232292)
--- trunk/Source/WebCore/ChangeLog 2018-05-30 15:26:51 UTC (rev 232291)
+++ trunk/Source/WebCore/ChangeLog 2018-05-30 15:47:41 UTC (rev 232292)
@@ -1,3 +1,10 @@
+2018-05-30 Alexey Proskuryakov <a...@apple.com>
+
+ Build fix attempt after https://trac.webkit.org/r232198
+
+ * platform/network/cf/ResourceHandleCFNet.cpp:
+ (WebCore::ResourceHandle::createCFURLConnection): Added some toString() calls.
+
2018-05-30 Zalan Bujtas <za...@apple.com>
[LFC] Miscellaneous fixes to get closer to geometry correctness
Modified: trunk/Source/WebCore/platform/network/cf/ResourceHandleCFNet.cpp (232291 => 232292)
--- trunk/Source/WebCore/platform/network/cf/ResourceHandleCFNet.cpp 2018-05-30 15:26:51 UTC (rev 232291)
+++ trunk/Source/WebCore/platform/network/cf/ResourceHandleCFNet.cpp 2018-05-30 15:47:41 UTC (rev 232292)
@@ -169,7 +169,7 @@
#if PLATFORM(IOS)
sslProps = adoptCF(ResourceHandle::createSSLPropertiesFromNSURLRequest(firstRequest()));
#else
- if (allowsAnyHTTPSCertificateHosts().contains(firstRequest().url().host())) {
+ if (allowsAnyHTTPSCertificateHosts().contains(firstRequest().url().host().toString())) {
sslProps = adoptCF(CFDictionaryCreateMutable(kCFAllocatorDefault, 0, &kCFTypeDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks));
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wdeprecated-declarations"
@@ -182,7 +182,7 @@
#endif
}
- auto clientCert = clientCertificates().find(firstRequest().url().host());
+ auto clientCert = clientCertificates().find(firstRequest().url().host().toString());
if (clientCert != clientCertificates().end()) {
if (!sslProps)
sslProps = adoptCF(CFDictionaryCreateMutable(kCFAllocatorDefault, 0, &kCFTypeDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks));
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
