diff --git a/indra/cmake/CURL.cmake b/indra/cmake/CURL.cmake index 108b36d3944557b5157f37fb607cdf242943a2fd..cc424aa04b9a47aacf7b29083eb1e28a010c0d58 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 dab6df0d5213c1c862d66c01719996cb904b7d36..4ee1be66d7ed3debd55fc1562094026716e2a7cc 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 eacd636b602e13faf1fdd1fa974022546ec0d5c4..10ba2d037c1748de011bb96f6a8093ea9e8e5348 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);