Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
M
mpd
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Иван Мажукин
mpd
Commits
a714bdb0
Commit
a714bdb0
authored
Dec 23, 2019
by
Max Kellermann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
lib/curl: drop support for CURL versions older than 7.32.0
For simplicity, this commit removes a workaround for an old CURL bug.
parent
08787462
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
2 additions
and
18 deletions
+2
-18
NEWS
NEWS
+1
-0
Global.hxx
src/lib/curl/Global.hxx
+0
-10
Request.cxx
src/lib/curl/Request.cxx
+0
-7
meson.build
src/lib/curl/meson.build
+1
-1
No files found.
NEWS
View file @
a714bdb0
...
...
@@ -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)
...
...
src/lib/curl/Global.hxx
View file @
a714bdb0
...
...
@@ -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
,
...
...
src/lib/curl/Request.cxx
View file @
a714bdb0
...
...
@@ -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
();
}
...
...
src/lib/curl/meson.build
View file @
a714bdb0
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()
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment