mirror of
https://github.com/git/git
synced 2024-08-28 12:09:19 +00:00
Merge jn/maint-http-error-message
* commit 'be22d92eac809ad2bfa2b7c83ad7cad5a15f1c43': http: avoid empty error messages for some curl errors http: remove extra newline in error message
This commit is contained in:
commit
5b5d92aae9
9
http.c
9
http.c
|
@ -851,8 +851,13 @@ static int http_request(const char *url, void *result, int target, int options)
|
|||
init_curl_http_auth(slot->curl);
|
||||
ret = HTTP_REAUTH;
|
||||
}
|
||||
} else
|
||||
} else {
|
||||
if (!curl_errorstr[0])
|
||||
strlcpy(curl_errorstr,
|
||||
curl_easy_strerror(results.curl_result),
|
||||
sizeof(curl_errorstr));
|
||||
ret = HTTP_ERROR;
|
||||
}
|
||||
} else {
|
||||
error("Unable to start HTTP request for %s", url);
|
||||
ret = HTTP_START_FAILED;
|
||||
|
@ -908,7 +913,7 @@ int http_error(const char *url, int ret)
|
|||
{
|
||||
/* http_request has already handled HTTP_START_FAILED. */
|
||||
if (ret != HTTP_START_FAILED)
|
||||
error("%s while accessing %s\n", curl_errorstr, url);
|
||||
error("%s while accessing %s", curl_errorstr, url);
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue