Leak_Technologies/HULL
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix curl deprecations and remove FTP support

Browse Source
This commit is contained in:
Tim Angus 2025-07-18 12:06:14 +01:00
parent dfa0e23395
commit bc30e0186b
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
code/client/cl_curl.c
View File

@ -200,8 +200,8 @@ void CL_cURL_Cleanup(void)
} }
} }
static int CL_cURL_CallbackProgress( void *dummy, double dltotal, double dlnow, static int CL_cURL_CallbackProgress(void *clientp, curl_off_t dltotal, curl_off_t dlnow,
double ultotal, double ulnow ) curl_off_t ultotal, curl_off_t ulnow)
{ {
clc.downloadSize = (int)dltotal; clc.downloadSize = (int)dltotal;
Cvar_SetValue( "cl_downloadSize", clc.downloadSize ); Cvar_SetValue( "cl_downloadSize", clc.downloadSize );
@ -293,14 +293,13 @@ void CL_cURL_BeginDownload( const char *localName, const char *remoteURL )
CL_cURL_CallbackWrite); CL_cURL_CallbackWrite);
qcurl_easy_setopt_warn(clc.downloadCURL, CURLOPT_WRITEDATA, &clc.download); 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_NOPROGRESS, 0);
qcurl_easy_setopt_warn(clc.downloadCURL, CURLOPT_PROGRESSFUNCTION, qcurl_easy_setopt_warn(clc.downloadCURL, CURLOPT_XFERINFOFUNCTION,
CL_cURL_CallbackProgress); CL_cURL_CallbackProgress);
qcurl_easy_setopt_warn(clc.downloadCURL, CURLOPT_PROGRESSDATA, NULL); 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_FAILONERROR, 1);
qcurl_easy_setopt_warn(clc.downloadCURL, CURLOPT_FOLLOWLOCATION, 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_MAXREDIRS, 5);
qcurl_easy_setopt_warn(clc.downloadCURL, CURLOPT_PROTOCOLS, qcurl_easy_setopt_warn(clc.downloadCURL, CURLOPT_PROTOCOLS_STR, "http,https");
CURLPROTO_HTTP | CURLPROTO_HTTPS | CURLPROTO_FTP | CURLPROTO_FTPS);
qcurl_easy_setopt_warn(clc.downloadCURL, CURLOPT_BUFFERSIZE, CURL_MAX_READ_SIZE); 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) { if(!clc.downloadCURLM) {