summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-09-11 11:22:58 -0700
committerJunio C Hamano <gitster@pobox.com>2012-09-11 11:22:58 -0700
commit23328344a98c530c19ffc4ee0e851a437a1e3409 (patch)
treeff6bfb36ffbc830c8671b41a9f39e6d1c45446e2
parent8bc72fc7feab7b493cd84941dbb173e9ee418dd0 (diff)
parent4246b0bd900e72dbe83fd07cdfc946483a76214c (diff)
downloadgit-23328344a98c530c19ffc4ee0e851a437a1e3409.tar.gz
Merge branch 'js/no-curl-easy-strerror-on-old-curl' into maint
* js/no-curl-easy-strerror-on-old-curl: http.c: don't use curl_easy_strerror prior to curl-7.12.0
-rw-r--r--http.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/http.c b/http.c
index b61ac85d4b..18bc6bf7bf 100644
--- a/http.c
+++ b/http.c
@@ -806,10 +806,12 @@ static int http_request(const char *url, void *result, int target, int options)
ret = HTTP_REAUTH;
}
} else {
+#if LIBCURL_VERSION_NUM >= 0x070c00
if (!curl_errorstr[0])
strlcpy(curl_errorstr,
curl_easy_strerror(results.curl_result),
sizeof(curl_errorstr));
+#endif
ret = HTTP_ERROR;
}
} else {