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

input/curl: remove assertion after curl_multi_fdset() 

Some users reported that MPD crashes when using a new CURL version
with the threaded DNS resolver enabled.  It seems that
curl_multi_fdset() returns no file descriptor when the DNS resolver
runs in another thread, so MPD does not have any event to wait for.

On the CURL mailing list, somebody suggested to sleep for a fixed
amount of time.  This is not an elegant solution, because daemons
should never have to sleep without waiting for an event.  I hope the
CURL developers will review the API and remove the threaded DNS
resolver.

Meanwhile, I'm removing the assertion in question, to allow those
unfortunate users running the latest CURL version to continue using
MPD.
This commit is contained in:
Max Kellermann 2010-07-20 22:49:29 +02:00
parent a4908dca42
commit 1f976d6e54
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
NEWS
View File

@ -1,4 +1,6 @@
ver 0.15.12 (2010/??/??)
* input:
- curl: remove assertion after curl_multi_fdset()
* tags:
- rva2: set "gain", not "peak"
* decoders:

2
src/input/curl_input_plugin.c
View File

@ -259,8 +259,6 @@ input_curl_select(struct input_curl *c)
return -1;
}
assert(max_fd >= 0);
#if LIBCURL_VERSION_NUM >= 0x070f00
long timeout2;
mcode = curl_multi_timeout(c->multi, &timeout2);