Skip to content

M
mpd
Commit a8b0c558 authored by Max Kellermann's avatar Max Kellermann
Browse files
Options

input/curl: make proxy verify setting optional

These settings do not work if CURL was compiled with CURL_DISABLE_PROXY, and cause error "An unknown option was passed in to libcurl". Fixes regression by commit 7ab0dfc8
parent cac88e8b
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 2 deletions
src/input/plugins/CurlInputPlugin.cxx
View file @ a8b0c558
...@@ -439,8 +439,14 @@ CurlInputStream::InitEasy() ...@@ -439,8 +439,14 @@ CurlInputStream::InitEasy()
request->SetVerifyPeer(verify_peer); request->SetVerifyPeer(verify_peer);
request->SetVerifyHost(verify_host); request->SetVerifyHost(verify_host);
request->SetOption(CURLOPT_HTTPHEADER, request_headers.Get()); request->SetOption(CURLOPT_HTTPHEADER, request_headers.Get());
request->SetProxyVerifyPeer(verify_peer);
request->SetProxyVerifyHost(verify_host); try {
request->SetProxyVerifyPeer(verify_peer);
request->SetProxyVerifyHost(verify_host);
} catch (...) {
/* these methods fail if libCURL was compiled with
CURL_DISABLE_PROXY; ignore silently */
}
} }
void void
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment