oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

lib/curl: require CURL 7.33, remove bug workaround

Browse Source
This commit is contained in:
Max Kellermann 2019-08-26 20:43:39 +02:00
parent b18003ddfd
commit 115dd2b5ce
4 changed files with 3 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/input/plugins/CurlInputPlugin.cxx
View File

@ -48,10 +48,6 @@
#include <curl/curl.h> #include <curl/curl.h>
#if LIBCURL_VERSION_NUM < 0x071200
#error libcurl is too old
#endif
/** /**
* Do not buffer more than this number of bytes. It should be a * Do not buffer more than this number of bytes. It should be a
* reasonable limit that doesn't make low-end machines suffer too * reasonable limit that doesn't make low-end machines suffer too

15
src/lib/curl/Global.cxx
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2008-2016 Max Kellermann <max.kellermann@gmail.com> * Copyright 2008-2019 Max Kellermann <max.kellermann@gmail.com>
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions * modification, are permitted provided that the following conditions
@ -34,7 +34,6 @@
#include "event/SocketMonitor.hxx" #include "event/SocketMonitor.hxx"
#include "util/RuntimeError.hxx" #include "util/RuntimeError.hxx"
#include "util/Domain.hxx" #include "util/Domain.hxx"
#include "config.h"
#include <assert.h> #include <assert.h>
@ -127,18 +126,6 @@ CurlSocket::SocketFunction(gcc_unused CURL *easy,
cs = new CurlSocket(global, global.GetEventLoop(), cs = new CurlSocket(global, global.GetEventLoop(),
SocketDescriptor(s)); SocketDescriptor(s));
global.Assign(s, *cs); global.Assign(s, *cs);
} else {
#ifdef USE_EPOLL
/* when using epoll, we need to unregister the socket
each time this callback is invoked, because older
CURL versions may omit the CURL_POLL_REMOVE call
when the socket has been closed and recreated with
the same file number (bug found in CURL 7.26, CURL
7.33 not affected); in that case, epoll refuses the
EPOLL_CTL_MOD because it does not know the new
socket yet */
cs->Cancel();
#endif
} }
unsigned flags = CurlPollToFlags(action); unsigned flags = CurlPollToFlags(action);

2
src/lib/curl/Global.hxx
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2008-2016 Max Kellermann <max.kellermann@gmail.com> * Copyright 2008-2019 Max Kellermann <max.kellermann@gmail.com>
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions * modification, are permitted provided that the following conditions

2
src/lib/curl/meson.build
View File

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