Merge branch 'js/no-curl-easy-strerror-on-old-curl' into maint

gitster · gitster · commit 23328344a98c · 2012-09-11T11:22:58.000-07:00
* js/no-curl-easy-strerror-on-old-curl:
  http.c: don't use curl_easy_strerror prior to curl-7.12.0
diff --git 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 {

Original file line number	Diff line number	Diff line change
`@@ -806,10 +806,12 @@ static int http_request(const char url, void result, int target, int options)`
`806`	`806`	`ret = HTTP_REAUTH;`
`807`	`807`	`}`
`808`	`808`	`} else {`
	`809`	`+#if LIBCURL_VERSION_NUM >= 0x070c00`
`809`	`810`	`if (!curl_errorstr[0])`
`810`	`811`	`strlcpy(curl_errorstr,`
`811`	`812`	`curl_easy_strerror(results.curl_result),`
`812`	`813`	`sizeof(curl_errorstr));`
	`814`	`+#endif`
`813`	`815`	`ret = HTTP_ERROR;`
`814`	`816`	`}`
`815`	`817`	`} else {`