oysteikt
/
mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

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
This commit is contained in:
Max Kellermann 2020-06-10 22:29:47 +02:00
parent 7583cfe9b7
commit 6b3a282db4
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
NEWS
View File

@ -13,6 +13,7 @@ ver 0.21.24 (not yet released)
- enable the decoder plugins GME, ModPlug and WildMidi - enable the decoder plugins GME, ModPlug and WildMidi
- fix build failure with Android NDK r21 - fix build failure with Android NDK r21
* Windows * Windows
- fix stream playback
- enable the decoder plugins GME, ModPlug and WildMidi - enable the decoder plugins GME, ModPlug and WildMidi
- work around Meson bug breaking the Windows build with GCC 10 - work around Meson bug breaking the Windows build with GCC 10
* fix unit test failure * fix unit test failure

2
src/lib/curl/Request.cxx
View File

@ -56,7 +56,7 @@ CurlRequest::CurlRequest(CurlGlobal &_global,
easy.SetUserAgent("Music Player Daemon " VERSION); easy.SetUserAgent("Music Player Daemon " VERSION);
easy.SetHeaderFunction(_HeaderFunction, this); easy.SetHeaderFunction(_HeaderFunction, this);
easy.SetWriteFunction(WriteFunction, this); easy.SetWriteFunction(WriteFunction, this);
#ifndef ANDROID #if !defined(ANDROID) && !defined(_WIN32)
easy.SetOption(CURLOPT_NETRC, 1L); easy.SetOption(CURLOPT_NETRC, 1L);
#endif #endif
easy.SetErrorBuffer(error_buffer); easy.SetErrorBuffer(error_buffer);