Skip to content

Commit

Permalink
Merge branch 'br/http-init-fix'
Browse files Browse the repository at this point in the history
Code clean-up.

* br/http-init-fix:
  http: style fixes for curl_multi_init error check
  http.c: die if curl_*_init fails
  • Loading branch information
Junio C Hamano committed Sep 11, 2014
2 parents 825fd93 + 8837eb4 commit 6c1d42a
Showing 1 changed file with 7 additions and 5 deletions.
12 changes: 7 additions & 5 deletions http.c
Original file line number Diff line number Diff line change
Expand Up @@ -300,6 +300,9 @@ static CURL *get_curl_handle(void)
{
CURL *result = curl_easy_init();

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

if (!curl_ssl_verify) {
curl_easy_setopt(result, CURLOPT_SSL_VERIFYPEER, 0);
curl_easy_setopt(result, CURLOPT_SSL_VERIFYHOST, 0);
Expand Down Expand Up @@ -399,7 +402,8 @@ void http_init(struct remote *remote, const char *url, int proactive_auth)
git_config(urlmatch_config_entry, &config);
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;

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

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

if (getenv("GIT_SSL_NO_VERIFY"))
Expand Down

0 comments on commit 6c1d42a

Please sign in to comment.