Title: [285146] trunk
- Revision
- 285146
- Author
- [email protected]
- Date
- 2021-11-01 16:50:32 -0700 (Mon, 01 Nov 2021)
Log Message
[Curl] Explicitly disable libcurl's internal cookie support
https://bugs.webkit.org/show_bug.cgi?id=232586
Reviewed by Ross Kirsling.
.:
Setting CURLOPT_COOKIEFILE to NULL to disable the cookie engine was not added till 7.77.0
so require that version or later.
* Source/cmake/OptionsPlayStation.cmake:
* Source/cmake/OptionsWinCairo.cmake:
Source/WebCore:
Explicitly disable the cookie engine inside curl.
* platform/network/curl/CurlContext.cpp:
(WebCore::CurlHandle::CurlHandle):
Modified Paths
Diff
Modified: trunk/ChangeLog (285145 => 285146)
--- trunk/ChangeLog 2021-11-01 23:33:45 UTC (rev 285145)
+++ trunk/ChangeLog 2021-11-01 23:50:32 UTC (rev 285146)
@@ -1,3 +1,16 @@
+2021-11-01 Don Olmstead <[email protected]>
+
+ [Curl] Explicitly disable libcurl's internal cookie support
+ https://bugs.webkit.org/show_bug.cgi?id=232586
+
+ Reviewed by Ross Kirsling.
+
+ Setting CURLOPT_COOKIEFILE to NULL to disable the cookie engine was not added till 7.77.0
+ so require that version or later.
+
+ * Source/cmake/OptionsPlayStation.cmake:
+ * Source/cmake/OptionsWinCairo.cmake:
+
2021-11-01 David Kilzer <[email protected]>
Add ddkilzer's GitHub name to contributors.json
Modified: trunk/Source/WebCore/ChangeLog (285145 => 285146)
--- trunk/Source/WebCore/ChangeLog 2021-11-01 23:33:45 UTC (rev 285145)
+++ trunk/Source/WebCore/ChangeLog 2021-11-01 23:50:32 UTC (rev 285146)
@@ -1,3 +1,15 @@
+2021-11-01 Don Olmstead <[email protected]>
+
+ [Curl] Explicitly disable libcurl's internal cookie support
+ https://bugs.webkit.org/show_bug.cgi?id=232586
+
+ Reviewed by Ross Kirsling.
+
+ Explicitly disable the cookie engine inside curl.
+
+ * platform/network/curl/CurlContext.cpp:
+ (WebCore::CurlHandle::CurlHandle):
+
2021-11-01 Michael Smith <[email protected]>
[WebInspector][CORS] Show HTTP status code in CORS messages.
Modified: trunk/Source/WebCore/platform/network/curl/CurlContext.cpp (285145 => 285146)
--- trunk/Source/WebCore/platform/network/curl/CurlContext.cpp 2021-11-01 23:33:45 UTC (rev 285145)
+++ trunk/Source/WebCore/platform/network/curl/CurlContext.cpp 2021-11-01 23:50:32 UTC (rev 285146)
@@ -298,6 +298,7 @@
m_handle = curl_easy_init();
curl_easy_setopt(m_handle, CURLOPT_ERRORBUFFER, m_errorBuffer);
curl_easy_setopt(m_handle, CURLOPT_NOSIGNAL, 1L);
+ curl_easy_setopt(m_handle, CURLOPT_COOKIEFILE, nullptr);
enableShareHandle();
enableAllowedProtocols();
Modified: trunk/Source/cmake/OptionsPlayStation.cmake (285145 => 285146)
--- trunk/Source/cmake/OptionsPlayStation.cmake 2021-11-01 23:33:45 UTC (rev 285145)
+++ trunk/Source/cmake/OptionsPlayStation.cmake 2021-11-01 23:50:32 UTC (rev 285146)
@@ -132,7 +132,7 @@
set(OpenGLES2_NAMES ${EGL_NAMES})
find_package(Cairo REQUIRED)
-find_package(CURL REQUIRED)
+find_package(CURL 7.77.0 REQUIRED)
find_package(EGL REQUIRED)
find_package(Fontconfig REQUIRED)
find_package(Freetype REQUIRED)
Modified: trunk/Source/cmake/OptionsWinCairo.cmake (285145 => 285146)
--- trunk/Source/cmake/OptionsWinCairo.cmake 2021-11-01 23:33:45 UTC (rev 285145)
+++ trunk/Source/cmake/OptionsWinCairo.cmake 2021-11-01 23:50:32 UTC (rev 285146)
@@ -6,7 +6,7 @@
set(ENABLE_WEBKIT ON)
find_package(Cairo 1.15.12 REQUIRED)
-find_package(CURL 7.71.0 REQUIRED)
+find_package(CURL 7.77.0 REQUIRED)
find_package(ICU 61.2 REQUIRED COMPONENTS data i18n uc)
find_package(JPEG 1.5.2 REQUIRED)
find_package(LibXml2 2.9.7 REQUIRED)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
