Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Handle cURL library deprecation for redirect options #865

Merged
merged 1 commit into from
Feb 21, 2024
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions es-core/src/HttpReq.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down