kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

Merge branch 'jn/maint-http-error-message' 

* jn/maint-http-error-message:
  http: avoid empty error messages for some curl errors
  http: remove extra newline in error message
maint
Junio C Hamano 2011-10-10 15:56:17 -07:00
parent 61f9db7a50 be22d92eac
commit 9488c18923
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
http.c
View File

@ -851,8 +851,13 @@ static int http_request(const char *url, void *result, int target, int options)
init_curl_http_auth(slot->curl); init_curl_http_auth(slot->curl);
ret = HTTP_REAUTH; ret = HTTP_REAUTH;
} }
} else } else {
if (!curl_errorstr[0])
strlcpy(curl_errorstr,
curl_easy_strerror(results.curl_result),
sizeof(curl_errorstr));
ret = HTTP_ERROR; ret = HTTP_ERROR;
}
} else { } else {
error("Unable to start HTTP request for %s", url); error("Unable to start HTTP request for %s", url);
ret = HTTP_START_FAILED; ret = HTTP_START_FAILED;
@ -908,7 +913,7 @@ int http_error(const char *url, int ret)
{ {
/* http_request has already handled HTTP_START_FAILED. */ /* http_request has already handled HTTP_START_FAILED. */
if (ret != 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; return ret;
} }