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

Merge branch 'br/http-init-fix' 

Code clean-up.

* br/http-init-fix:
  http: style fixes for curl_multi_init error check
  http.c: die if curl_*_init fails
maint
Junio C Hamano 2014-09-11 10:33:27 -07:00
parent 825fd93767 8837eb47f2
commit 6c1d42acae
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
http.c
View File

@ -300,6 +300,9 @@ static CURL *get_curl_handle(void)
{ {
CURL *result = curl_easy_init(); CURL *result = curl_easy_init();


if (!result)
die("curl_easy_init failed");

if (!curl_ssl_verify) { if (!curl_ssl_verify) {
curl_easy_setopt(result, CURLOPT_SSL_VERIFYPEER, 0); curl_easy_setopt(result, CURLOPT_SSL_VERIFYPEER, 0);
curl_easy_setopt(result, CURLOPT_SSL_VERIFYHOST, 0); curl_easy_setopt(result, CURLOPT_SSL_VERIFYHOST, 0);
@ -399,7 +402,8 @@ void http_init(struct remote *remote, const char *url, int proactive_auth)
git_config(urlmatch_config_entry, &config); git_config(urlmatch_config_entry, &config);
free(normalized_url); free(normalized_url);


curl_global_init(CURL_GLOBAL_ALL); if (curl_global_init(CURL_GLOBAL_ALL) != CURLE_OK)
die("curl_global_init failed");


http_proactive_auth = proactive_auth; http_proactive_auth = proactive_auth;


@ -417,10 +421,8 @@ void http_init(struct remote *remote, const char *url, int proactive_auth)
} }


curlm = curl_multi_init(); curlm = curl_multi_init();
if (curlm == NULL) { if (!curlm)
fprintf(stderr, "Error creating curl multi handle.\n"); die("curl_multi_init failed");
exit(1);
}
#endif #endif


if (getenv("GIT_SSL_NO_VERIFY")) if (getenv("GIT_SSL_NO_VERIFY"))