diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-09-03 15:54:30 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-09-03 15:54:30 -0700 |
| commit | c1310be00c13ab4b949fcbc0e09c629ba2828eef (patch) | |
| tree | b643e34809f82f94f95a33518adb6c9c76a14cbb | |
| parent | Merge branch 'jc/maint-mergetool-style-fix' (diff) | |
| parent | http.c: don't use curl_easy_strerror prior to curl-7.12.0 (diff) | |
| download | git-c1310be00c13ab4b949fcbc0e09c629ba2828eef.tar.gz git-c1310be00c13ab4b949fcbc0e09c629ba2828eef.zip | |
Merge branch 'js/no-curl-easy-strerror-on-old-curl'
Done to support compilation on __TANDEM, but is independently useful
for people with older version of libcURL.
* 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.c | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -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 { |
