mirror/transmission
1
0
Fork 0
mirror of https://github.com/transmission/transmission synced 2025-03-13 07:33:02 +00:00
Code Issues Releases Wiki Activity

build: remove the test to see if curl is at least 7.15.6 (#7462)

Browse source 
CMakeLists.txt requires curl >= 7.28.0, so we do not need to test this.
This commit is contained in:
Charles Kerr 2025-03-05 14:35:31 -06:00 • committed by GitHub
parent ea2cac2335
commit c398bd26f3
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 0 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
libtransmission/web.cc
View file

@ -49,10 +49,6 @@
using namespace std::literals; using namespace std::literals;
#if LIBCURL_VERSION_NUM >= 0x070F06 // CURLOPT_SOCKOPT* was added in 7.15.6
#define USE_LIBCURL_SOCKOPT
#endif
// --- // ---
namespace namespace
@ -526,7 +522,6 @@ public:
return bytes_used; return bytes_used;
} }
#ifdef USE_LIBCURL_SOCKOPT
static int onSocketCreated(void* vtask, curl_socket_t fd, curlsocktype /*purpose*/) static int onSocketCreated(void* vtask, curl_socket_t fd, curlsocktype /*purpose*/)
{ {
auto const* const task = static_cast<Task const*>(vtask); auto const* const task = static_cast<Task const*>(vtask);
@ -547,7 +542,6 @@ public:
// return nonzero if this function encountered an error // return nonzero if this function encountered an error
return 0; return 0;
} }
#endif
void initEasy(Task& task) void initEasy(Task& task)
{ {
@ -563,11 +557,8 @@ public:
(void)curl_easy_setopt(e, CURLOPT_NOSIGNAL, 1L); (void)curl_easy_setopt(e, CURLOPT_NOSIGNAL, 1L);
(void)curl_easy_setopt(e, CURLOPT_PRIVATE, &task); (void)curl_easy_setopt(e, CURLOPT_PRIVATE, &task);
(void)curl_easy_setopt(e, CURLOPT_IPRESOLVE, task.ipProtocol()); (void)curl_easy_setopt(e, CURLOPT_IPRESOLVE, task.ipProtocol());
#ifdef USE_LIBCURL_SOCKOPT
(void)curl_easy_setopt(e, CURLOPT_SOCKOPTFUNCTION, onSocketCreated); (void)curl_easy_setopt(e, CURLOPT_SOCKOPTFUNCTION, onSocketCreated);
(void)curl_easy_setopt(e, CURLOPT_SOCKOPTDATA, &task); (void)curl_easy_setopt(e, CURLOPT_SOCKOPTDATA, &task);
#endif
if (!curl_ssl_verify) if (!curl_ssl_verify)
{ {