From: Mark Wielaard Date: Tue, 10 Jan 2023 22:20:41 +0000 (+0100) Subject: debuginfod-client: Use CURLOPT_PROTOCOLS_STR for libcurl >= 7.85.0 X-Git-Tag: elfutils-0.189~43 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6560fb26a62ef135a804357ef4f15a47de3e49b3;p=thirdparty%2Felfutils.git debuginfod-client: Use CURLOPT_PROTOCOLS_STR for libcurl >= 7.85.0 https://sourceware.org/bugzilla/show_bug.cgi?id=29926 Signed-off-by: Mark Wielaard --- diff --git a/debuginfod/ChangeLog b/debuginfod/ChangeLog index 2ddb7ca06..8f9637f50 100644 --- a/debuginfod/ChangeLog +++ b/debuginfod/ChangeLog @@ -1,3 +1,8 @@ +2023-01-10 Mark Wielaard + + * debuginfod-client.c (debuginfod_query_server): Use + CURL_AT_LEAST_VERSION(7.85.0) for CURLOPT_PROTOCOLS_STR. + 2022-12-21 Mark Wielaard * debuginfod-client.c: Define CURL_AT_LEAST_VERSION. diff --git a/debuginfod/debuginfod-client.c b/debuginfod/debuginfod-client.c index a16165bd1..1ce456327 100644 --- a/debuginfod/debuginfod-client.c +++ b/debuginfod/debuginfod-client.c @@ -1336,8 +1336,13 @@ debuginfod_query_server (debuginfod_client *c, /* Only allow http:// + https:// + file:// so we aren't being redirected to some unsupported protocol. */ +#if CURL_AT_LEAST_VERSION(7, 85, 0) + curl_easy_setopt_ck(data[i].handle, CURLOPT_PROTOCOLS_STR, + "http,https,file"); +#else curl_easy_setopt_ck(data[i].handle, CURLOPT_PROTOCOLS, (CURLPROTO_HTTP | CURLPROTO_HTTPS | CURLPROTO_FILE)); +#endif curl_easy_setopt_ck(data[i].handle, CURLOPT_URL, data[i].url); if (vfd >= 0) curl_easy_setopt_ck(data[i].handle, CURLOPT_ERRORBUFFER,