Merge pull request #865 from cmitu/curl-warning

Handle cURL library deprecation for redirect options
RetroPie · Feb 21, 2024 · 3ed0ac6 · 3ed0ac6
2 parents 7b45bf7 + d544c73
commit 3ed0ac6
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/es-core/src/HttpReq.cpp b/es-core/src/HttpReq.cpp
@@ -77,7 +77,13 @@ HttpReq::HttpReq(const std::string& url)
 	}
 
 	//set curl restrict redirect protocols
+	//starting with 7.85.0, CURLOPT_REDIR_PROTOCOLS is deprecated
+	// and CURLOPT_REDIR_PROTOCOLS_STR should be used instead
+#if CURL_AT_LEAST_VERSION(7,85,0)
+	err = curl_easy_setopt(mHandle, CURLOPT_REDIR_PROTOCOLS_STR, "http,https");
+#else
 	err = curl_easy_setopt(mHandle, CURLOPT_REDIR_PROTOCOLS, CURLPROTO_HTTP | CURLPROTO_HTTPS);
+#endif
 	if(err != CURLE_OK)
 	{
 		mStatus = REQ_IO_ERROR;