Title: [279575] trunk/Source/WebCore
- Revision
- 279575
- Author
- [email protected]
- Date
- 2021-07-06 00:44:20 -0700 (Tue, 06 Jul 2021)
Log Message
[curl][Win] wss: WebSocket doesn't work since r271170
https://bugs.webkit.org/show_bug.cgi?id=227694
Reviewed by Don Olmstead.
r271170 started to use CURLSSLOPT_NATIVE_CA for https for Windows.
However, I forgot to set the flag to WebSocket curl handles.
* platform/network/curl/CurlContext.cpp:
(WebCore::CurlHandle::enableSSLForHost):
(WebCore::CurlHandle::enableHttp):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (279574 => 279575)
--- trunk/Source/WebCore/ChangeLog 2021-07-06 05:45:23 UTC (rev 279574)
+++ trunk/Source/WebCore/ChangeLog 2021-07-06 07:44:20 UTC (rev 279575)
@@ -1,3 +1,17 @@
+2021-07-06 Fujii Hironori <[email protected]>
+
+ [curl][Win] wss: WebSocket doesn't work since r271170
+ https://bugs.webkit.org/show_bug.cgi?id=227694
+
+ Reviewed by Don Olmstead.
+
+ r271170 started to use CURLSSLOPT_NATIVE_CA for https for Windows.
+ However, I forgot to set the flag to WebSocket curl handles.
+
+ * platform/network/curl/CurlContext.cpp:
+ (WebCore::CurlHandle::enableSSLForHost):
+ (WebCore::CurlHandle::enableHttp):
+
2021-07-05 Wenson Hsieh <[email protected]>
Live Text should not be visible in video thumbnail images behind "Skip Ad" button on YouTube
Modified: trunk/Source/WebCore/platform/network/curl/CurlContext.cpp (279574 => 279575)
--- trunk/Source/WebCore/platform/network/curl/CurlContext.cpp 2021-07-06 05:45:23 UTC (rev 279574)
+++ trunk/Source/WebCore/platform/network/curl/CurlContext.cpp 2021-07-06 07:44:20 UTC (rev 279575)
@@ -333,7 +333,9 @@
setSslCtxCallbackFunction(willSetupSslCtxCallback, this);
-#if !OS(WINDOWS)
+#if OS(WINDOWS)
+ curl_easy_setopt(m_handle, CURLOPT_SSL_OPTIONS, CURLSSLOPT_NATIVE_CA);
+#else
if (auto* path = WTF::get_if<String>(sslHandle.getCACertInfo()))
setCACertPath(path->utf8().data());
#endif
@@ -462,9 +464,6 @@
curl_easy_setopt(m_handle, CURLOPT_PIPEWAIT, 1L);
curl_easy_setopt(m_handle, CURLOPT_SSL_ENABLE_ALPN, 1L);
curl_easy_setopt(m_handle, CURLOPT_SSL_ENABLE_NPN, 0L);
-#if OS(WINDOWS)
- curl_easy_setopt(m_handle, CURLOPT_SSL_OPTIONS, CURLSSLOPT_NATIVE_CA);
-#endif
} else
curl_easy_setopt(m_handle, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1);
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
