From 082bf4e7a3a1b54698c4c3da3c86050b1387845c Mon Sep 17 00:00:00 2001
From: Rye Mutt <rye@alchemyviewer.org>
Date: Wed, 19 Jan 2022 19:13:56 -0500
Subject: [PATCH] Switch to c-ares for win curl
---
indra/cmake/CURL.cmake | 1 +
indra/llcorehttp/_httpoprequest.cpp | 2 +-
indra/llcorehttp/httpcommon.cpp | 4 ++--
3 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/indra/cmake/CURL.cmake b/indra/cmake/CURL.cmake
index 108b36d3944..cc424aa04b9 100644
--- a/indra/cmake/CURL.cmake
+++ b/indra/cmake/CURL.cmake
@@ -17,6 +17,7 @@ else (USESYSTEMLIBS)
debug ${ARCH_PREBUILT_DIRS_DEBUG}/libcaresd.lib
optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libcares.lib
Normaliz.lib
+ Iphlpapi.lib
)
elseif(DARWIN)
set(CURL_LIBRARIES
diff --git a/indra/llcorehttp/_httpoprequest.cpp b/indra/llcorehttp/_httpoprequest.cpp
index dab6df0d521..4ee1be66d7e 100644
--- a/indra/llcorehttp/_httpoprequest.cpp
+++ b/indra/llcorehttp/_httpoprequest.cpp
@@ -511,7 +511,7 @@ HttpStatus HttpOpRequest::prepareRequest(HttpService * service)
check_curl_easy_setopt(mCurlHandle, CURLOPT_NOPROGRESS, 1);
check_curl_easy_setopt(mCurlHandle, CURLOPT_URL, mReqURL.c_str());
check_curl_easy_setopt(mCurlHandle, CURLOPT_PRIVATE, getHandle());
- //check_curl_easy_setopt(mCurlHandle, CURLOPT_ACCEPT_ENCODING, "gzip,deflate");
+ check_curl_easy_setopt(mCurlHandle, CURLOPT_ACCEPT_ENCODING, nullptr);
check_curl_easy_setopt(mCurlHandle, CURLOPT_AUTOREFERER, 1);
check_curl_easy_setopt(mCurlHandle, CURLOPT_MAXREDIRS, HTTP_REDIRECTS_DEFAULT);
diff --git a/indra/llcorehttp/httpcommon.cpp b/indra/llcorehttp/httpcommon.cpp
index eacd636b602..10ba2d037c1 100644
--- a/indra/llcorehttp/httpcommon.cpp
+++ b/indra/llcorehttp/httpcommon.cpp
@@ -284,8 +284,8 @@ CURL *getCurlTemplateHandle()
check_curl_code(result, CURLOPT_NOSIGNAL);
result = curl_easy_setopt(curlpTemplateHandle, CURLOPT_NOPROGRESS, 1);
check_curl_code(result, CURLOPT_NOPROGRESS);
- //result = curl_easy_setopt(curlpTemplateHandle, CURLOPT_ACCEPT_ENCODING, "gzip,deflate");
- //check_curl_code(result, CURLOPT_ACCEPT_ENCODING);
+ result = curl_easy_setopt(curlpTemplateHandle, CURLOPT_ACCEPT_ENCODING, nullptr);
+ check_curl_code(result, CURLOPT_ACCEPT_ENCODING);
result = curl_easy_setopt(curlpTemplateHandle, CURLOPT_AUTOREFERER, 1);
check_curl_code(result, CURLOPT_AUTOREFERER);
result = curl_easy_setopt(curlpTemplateHandle, CURLOPT_FOLLOWLOCATION, 1);
--
GitLab