From 6b3a282db4e536d62d5f16f7c75c4e3368fc819c Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Wed, 10 Jun 2020 22:29:47 +0200 Subject: [PATCH] lib/curl/Request: don't enable CURLOPT_NETRC on Windows Our Windows build is built with `--disable-netrc`, and that makes CURLOPT_NETRC fail, causing failures with all streams. D'oh! Closes https://github.com/MusicPlayerDaemon/MPD/issues/886 --- NEWS | 1 + src/lib/curl/Request.cxx | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/NEWS b/NEWS index bda78362f..914b73705 100644 --- a/NEWS +++ b/NEWS @@ -13,6 +13,7 @@ ver 0.21.24 (not yet released) - enable the decoder plugins GME, ModPlug and WildMidi - fix build failure with Android NDK r21 * Windows + - fix stream playback - enable the decoder plugins GME, ModPlug and WildMidi - work around Meson bug breaking the Windows build with GCC 10 * fix unit test failure diff --git a/src/lib/curl/Request.cxx b/src/lib/curl/Request.cxx index 75ce11eed..774066877 100644 --- a/src/lib/curl/Request.cxx +++ b/src/lib/curl/Request.cxx @@ -56,7 +56,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);