From bc30e0186b5d4de97775b09cbef9351aef08ff79 Mon Sep 17 00:00:00 2001 From: Tim Angus Date: Fri, 18 Jul 2025 12:06:14 +0100 Subject: [PATCH] Fix curl deprecations and remove FTP support --- code/client/cl_curl.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/code/client/cl_curl.c b/code/client/cl_curl.c index cca6497f..bec34632 100644 --- a/code/client/cl_curl.c +++ b/code/client/cl_curl.c @@ -200,8 +200,8 @@ void CL_cURL_Cleanup(void) } } -static int CL_cURL_CallbackProgress( void *dummy, double dltotal, double dlnow, - double ultotal, double ulnow ) +static int CL_cURL_CallbackProgress(void *clientp, curl_off_t dltotal, curl_off_t dlnow, + curl_off_t ultotal, curl_off_t ulnow) { clc.downloadSize = (int)dltotal; Cvar_SetValue( "cl_downloadSize", clc.downloadSize ); @@ -293,16 +293,15 @@ void CL_cURL_BeginDownload( const char *localName, const char *remoteURL ) CL_cURL_CallbackWrite); qcurl_easy_setopt_warn(clc.downloadCURL, CURLOPT_WRITEDATA, &clc.download); qcurl_easy_setopt_warn(clc.downloadCURL, CURLOPT_NOPROGRESS, 0); - qcurl_easy_setopt_warn(clc.downloadCURL, CURLOPT_PROGRESSFUNCTION, + qcurl_easy_setopt_warn(clc.downloadCURL, CURLOPT_XFERINFOFUNCTION, CL_cURL_CallbackProgress); qcurl_easy_setopt_warn(clc.downloadCURL, CURLOPT_PROGRESSDATA, NULL); qcurl_easy_setopt_warn(clc.downloadCURL, CURLOPT_FAILONERROR, 1); qcurl_easy_setopt_warn(clc.downloadCURL, CURLOPT_FOLLOWLOCATION, 1); qcurl_easy_setopt_warn(clc.downloadCURL, CURLOPT_MAXREDIRS, 5); - qcurl_easy_setopt_warn(clc.downloadCURL, CURLOPT_PROTOCOLS, - CURLPROTO_HTTP | CURLPROTO_HTTPS | CURLPROTO_FTP | CURLPROTO_FTPS); + qcurl_easy_setopt_warn(clc.downloadCURL, CURLOPT_PROTOCOLS_STR, "http,https"); qcurl_easy_setopt_warn(clc.downloadCURL, CURLOPT_BUFFERSIZE, CURL_MAX_READ_SIZE); - clc.downloadCURLM = qcurl_multi_init(); + clc.downloadCURLM = qcurl_multi_init(); if(!clc.downloadCURLM) { qcurl_easy_cleanup(clc.downloadCURL); clc.downloadCURL = NULL;