From: barkalow@iabervon.org <barkalow@iabervon.org>
Date: Sun, 31 Jul 2005 19:59:20 +0000 (-0400)
Subject: [PATCH] Fix support for old libcurl
X-Git-Tag: v0.99.3~12
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=9f6cf65e66c441d99f4838b6b74971d48c4efc72;p=git.git

[PATCH] Fix support for old libcurl

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 <barkalow@iabervon.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
---

diff --git a/http-pull.c b/http-pull.c
index da4d65ab..38047e69 100644
--- 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;