Merge tag 'v0.21.24'

release v0.21.24
2020-06-10 22:58:14 +02:00
parent 96a273bf3b 24741c5d06
commit c6a7f6dabc
16 changed files with 88 additions and 36 deletions
--- a/src/lib/curl/Request.cxx
+++ b/src/lib/curl/Request.cxx
@@ -57,7 +57,7 @@ CurlRequest::CurlRequest(CurlGlobal &_global,
 	easy.SetUserAgent("Music Player Daemon " VERSION);
 	easy.SetHeaderFunction(_HeaderFunction, this);
 	easy.SetWriteFunction(WriteFunction, this);
-#ifndef ANDROID
+#if !defined(ANDROID) && !defined(_WIN32)
 	easy.SetOption(CURLOPT_NETRC, 1L);
 #endif
 	easy.SetErrorBuffer(error_buffer);