diff options
| author | Max Kellermann <max@duempel.org> | 2014-11-02 12:27:46 +0100 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2014-11-02 12:27:46 +0100 |
| commit | 1f59701c46d7a75d9af92b9df14e03c2bc1ce730 (patch) | |
| tree | 3bf8dc72a91cb3096915cec447e5060df209f106 | |
| parent | 054323c2bc8ec5f1e417f85e3293f2a91d8425d8 (diff) | |
| parent | ec3191f50279c432ffef7449133db1d4c433120c (diff) | |
| download | mpd-1f59701c46d7a75d9af92b9df14e03c2bc1ce730.tar.gz mpd-1f59701c46d7a75d9af92b9df14e03c2bc1ce730.tar.xz mpd-1f59701c46d7a75d9af92b9df14e03c2bc1ce730.zip | |
Merge branch 'v0.18.x' into v0.19.x
Diffstat (limited to '')
| -rw-r--r-- | NEWS | 9 | ||||
| -rw-r--r-- | src/input/plugins/CurlInputPlugin.cxx | 2 |
2 files changed, 10 insertions, 1 deletions
@@ -101,6 +101,15 @@ ver 0.19 (2014/10/10) * install systemd unit for socket activation * Android port +ver 0.18.17 (not yet released) +* playlist + - don't allow empty playlist name + - m3u: recognize the file suffix ".m3u8" +* decoder + - ignore URI query string for plugin detection + - faad: remove workaround for ancient libfaad2 ABI bug + - ffmpeg: recognize MIME type audio/aacp + ver 0.18.16 (2014/09/26) * fix DSD breakage due to typo in configure.ac diff --git a/src/input/plugins/CurlInputPlugin.cxx b/src/input/plugins/CurlInputPlugin.cxx index 42575a3fa..0028158a3 100644 --- a/src/input/plugins/CurlInputPlugin.cxx +++ b/src/input/plugins/CurlInputPlugin.cxx @@ -723,7 +723,7 @@ CurlInputStream::InitEasy(Error &error) curl_easy_setopt(easy, CURLOPT_FOLLOWLOCATION, 1l); curl_easy_setopt(easy, CURLOPT_NETRC, 1l); curl_easy_setopt(easy, CURLOPT_MAXREDIRS, 5l); - curl_easy_setopt(easy, CURLOPT_FAILONERROR, true); + curl_easy_setopt(easy, CURLOPT_FAILONERROR, 1l); curl_easy_setopt(easy, CURLOPT_ERRORBUFFER, error_buffer); curl_easy_setopt(easy, CURLOPT_NOPROGRESS, 1l); curl_easy_setopt(easy, CURLOPT_NOSIGNAL, 1l); |