From 4dd10894bae81f142239e4580910bd2f04067ca4 Mon Sep 17 00:00:00 2001 From: Thomas Guillem Date: Tue, 24 Mar 2020 14:52:22 +0100 Subject: [PATCH] lib/curl/Request: fix Exception "error" on Android Apparently, it's not possible to change CURLOPT_NETRC on Android. --- NEWS | 2 ++ src/lib/curl/Request.cxx | 2 ++ 2 files changed, 4 insertions(+) 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();