fix(http): Fix "Failed sending data to the peer" errors (#1443)

joeyparrish · web-flow · commit 2c9d100d445f · 2024-10-24T13:53:39.000-07:00
Upgrading curl fixes errors like "Failed sending data to the peer" flooding the log. This is described upstream in curl/curl#10591 and fixed in curl 8.2.0. Here we upgrade to curl 8.9.1 (latest as of today). This required updating the way we attach c-ares to libcurl and updating CURLOPT_PUT (deprecated) to CURLOPT_UPLOAD (compatible equivalent AFAICT).
diff --git a/packager/file/http_file.cc b/packager/file/http_file.cc
@@ -311,7 +311,7 @@ void HttpFile::SetupRequest() {
       curl_easy_setopt(curl, CURLOPT_POST, 1L);
       break;
     case HttpMethod::kPut:
-      curl_easy_setopt(curl, CURLOPT_PUT, 1L);
+      curl_easy_setopt(curl, CURLOPT_UPLOAD, 1L);
       break;
   }
 
diff --git a/packager/third_party/curl/CMakeLists.txt b/packager/third_party/curl/CMakeLists.txt
@@ -45,5 +45,5 @@ add_subdirectory(source)
 # Our enabling of c-ares doesn't automatically set a dependency between libcurl
 # and c-ares.  Fix that now.
 if(USE_ARES)
-  target_link_libraries(libcurl c-ares)
+  target_link_libraries(libcurl_static PUBLIC c-ares)
 endif()
diff --git a/packager/third_party/curl/source b/packager/third_party/curl/source
@@ -1 +1 @@
-Subproject commit 462196e6b4a47f924293a0e26b8e9c23d37ac26f
+Subproject commit 83bedbd730d62b83744cc26fa0433d3f6e2e4cd6

Original file line number	Diff line number	Diff line change
`@@ -311,7 +311,7 @@ void HttpFile::SetupRequest() {`
`311`	`311`	`curl_easy_setopt(curl, CURLOPT_POST, 1L);`
`312`	`312`	`break;`
`313`	`313`	`case HttpMethod::kPut:`
`314`		`- curl_easy_setopt(curl, CURLOPT_PUT, 1L);`
	`314`	`+ curl_easy_setopt(curl, CURLOPT_UPLOAD, 1L);`
`315`	`315`	`break;`
`316`	`316`	`}`
`317`	`317`