Merge tag 'v0.20.18'

release v0.20.18

src/lib/curl/Request.cxx

@@ -64,6 +64,7 @@ CurlRequest::CurlRequest(CurlGlobal &_global,
 	easy.SetOption(CURLOPT_NOPROGRESS, 1l);
 	easy.SetOption(CURLOPT_NOSIGNAL, 1l);
 	easy.SetOption(CURLOPT_CONNECTTIMEOUT, 10l);
+	easy.SetOption(CURLOPT_HTTPAUTH, (long) CURLAUTH_ANY);
 }
 
 CurlRequest::~CurlRequest() noexcept

src/lib/nfs/Connection.cxx

@@ -31,7 +31,11 @@ extern "C" {
 
 #include <utility>
 
+#ifdef _WIN32
+#include <winsock2.h>
+#else
 #include <poll.h> /* for POLLIN, POLLOUT */
+#endif
 
 static constexpr std::chrono::steady_clock::duration NFS_MOUNT_TIMEOUT =
 	std::chrono::minutes(1);

src/lib/nfs/FileReader.cxx

@@ -30,7 +30,6 @@
 #include <assert.h>
 #include <string.h>
 #include <fcntl.h>
-#include <sys/stat.h>
 
 NfsFileReader::NfsFileReader() noexcept
 	:defer_open(nfs_get_event_loop(), BIND_THIS_METHOD(OnDeferredOpen))

src/lib/nfs/FileReader.hxx

@@ -31,6 +31,7 @@
 
 #include <stdint.h>
 #include <stddef.h>
+#include <sys/stat.h>
 
 struct nfsfh;
 class NfsConnection;