undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'sp/remote-curl-ssl-strerror' into maint

Browse Source 
Help those who debug http(s) part of the system.

* sp/remote-curl-ssl-strerror:
  remote-curl: include curl_errorstr on SSL setup failures
This commit is contained in:
Junio C Hamano 2016-03-10 11:13:37 -08:00
commit 33b81b2d2e
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
remote-curl.c
View File

@ -439,8 +439,20 @@ static int run_slot(struct active_request_slot *slot,
err = run_one_slot(slot, results); err = run_one_slot(slot, results);
if (err != HTTP_OK && err != HTTP_REAUTH) { if (err != HTTP_OK && err != HTTP_REAUTH) {
error("RPC failed; result=%d, HTTP code = %ld", struct strbuf msg = STRBUF_INIT;
results->curl_result, results->http_code); if (results->http_code && results->http_code != 200)
strbuf_addf(&msg, "HTTP %ld", results->http_code);
if (results->curl_result != CURLE_OK) {
if (msg.len)
strbuf_addch(&msg, ' ');
strbuf_addf(&msg, "curl %d", results->curl_result);
if (curl_errorstr[0]) {
strbuf_addch(&msg, ' ');
strbuf_addstr(&msg, curl_errorstr);
}
}
error("RPC failed; %s", msg.buf);
strbuf_release(&msg);
} }
return err; return err;