[PATCH 1/3] Fix support for old libcurl
From: <hidden>
Date: 2016-06-15 22:42:03
Subsystem:
the rest · Maintainer:
Linus Torvalds
Old libcurl has curl_easy_setopt(), and http-pull requires it; it just doesn't have one of the options. Signed-off-by: Daniel Barkalow <redacted> --- http-pull.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) 9c32b0230180d507b4429fb35432bc404a89e637
diff --git a/http-pull.c b/http-pull.c
--- a/http-pull.c
+++ b/http-pull.c@@ -12,9 +12,6 @@ #if LIBCURL_VERSION_NUM < 0x070800 #define curl_global_init(a) do { /* nothing */ } while(0) #endif -#if LIBCURL_VERSION_NUM < 0x070907 -#define curl_easy_setopt(a, b, c) do { /* nothing */ } while(0) -#endif static CURL *curl;
@@ -187,7 +184,9 @@ int main(int argc, char **argv) curl_ssl_verify = gitenv("GIT_SSL_NO_VERIFY") ? 0 : 1; curl_easy_setopt(curl, CURLOPT_SSL_VERIFYPEER, curl_ssl_verify); +#if LIBCURL_VERSION_NUM >= 0x070907 curl_easy_setopt(curl, CURLOPT_NETRC, CURL_NETRC_OPTIONAL); +#endif base = url;