summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Guillem <thomas@gllm.fr>2020-03-24 14:52:22 +0100
committerMax Kellermann <max@musicpd.org>2020-03-26 17:26:14 +0100
commit4dd10894bae81f142239e4580910bd2f04067ca4 (patch)
treec12e545718b9f87a27884b735509a1e0237f403a
parent608d7ec1e7b2493a369639021e3074fd5a7ae1fa (diff)
lib/curl/Request: fix Exception "error" on Android
Apparently, it's not possible to change CURLOPT_NETRC on Android.
-rw-r--r--NEWS2
-rw-r--r--src/lib/curl/Request.cxx2
2 files changed, 4 insertions, 0 deletions
diff --git a/NEWS b/NEWS
index 9d73dba96..61903f216 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,6 @@
ver 0.21.22 (not yet released)
+* input
+ - curl: fix streaming errors on Android
* playlist
- rss: support MIME type application/xml
* mixer
diff --git a/src/lib/curl/Request.cxx b/src/lib/curl/Request.cxx
index a47e7f703..75ce11eed 100644
--- a/src/lib/curl/Request.cxx
+++ b/src/lib/curl/Request.cxx
@@ -56,7 +56,9 @@ CurlRequest::CurlRequest(CurlGlobal &_global,
easy.SetUserAgent("Music Player Daemon " VERSION);
easy.SetHeaderFunction(_HeaderFunction, this);
easy.SetWriteFunction(WriteFunction, this);
+#ifndef ANDROID
easy.SetOption(CURLOPT_NETRC, 1L);
+#endif
easy.SetErrorBuffer(error_buffer);
easy.SetNoProgress();
easy.SetNoSignal();