lib/curl: drop support for CURL versions older than 7.32.0

For simplicity, this commit removes a workaround for an old CURL bug.
This commit is contained in:
Max Kellermann 2019-12-23 14:41:06 +01:00
parent 087874620f
commit a714bdb0ce
4 changed files with 2 additions and 18 deletions

1
NEWS
View File

@ -3,6 +3,7 @@ ver 0.21.18 (not yet released)
- alsa: fix hang bug with ALSA "null" outputs
* storage
- curl: fix crash bug
* drop support for CURL versions older than 7.32.0
* reduce unnecessary CPU wakeups
ver 0.21.17 (2019/12/16)

View File

@ -74,16 +74,6 @@ public:
SocketAction(CURL_SOCKET_TIMEOUT, 0);
}
/**
* This is a kludge to allow pausing/resuming a stream with
* libcurl < 7.32.0. Read the curl_easy_pause manpage for
* more information.
*/
void ResumeSockets() {
int running_handles;
curl_multi_socket_all(multi.Get(), &running_handles);
}
private:
void UpdateTimeout(long timeout_ms) noexcept;
static int TimerFunction(CURLM *global, long timeout_ms,

View File

@ -30,7 +30,6 @@
#include "config.h"
#include "Request.hxx"
#include "Global.hxx"
#include "Version.hxx"
#include "Handler.hxx"
#include "event/Call.hxx"
#include "util/RuntimeError.hxx"
@ -124,12 +123,6 @@ CurlRequest::Resume() noexcept
curl_easy_pause(easy.Get(), CURLPAUSE_CONT);
if (IsCurlOlderThan(0x072000))
/* libcurl older than 7.32.0 does not update
its sockets after curl_easy_pause(); force
libcurl to do it now */
global.ResumeSockets();
global.InvalidateSockets();
}

View File

@ -1,4 +1,4 @@
curl_dep = dependency('libcurl', version: '>= 7.18', required: get_option('curl'))
curl_dep = dependency('libcurl', version: '>= 7.32', required: get_option('curl'))
conf.set('ENABLE_CURL', curl_dep.found())
if not curl_dep.found()
subdir_done()