зеркало из https://github.com/microsoft/git.git
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
This commit is contained in:
Коммит
6c1d42acae
12
http.c
12
http.c
|
@ -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);
|
||||
|
@ -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;
|
||||
|
||||
|
@ -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"))
|
||||
|
|
Загрузка…
Ссылка в новой задаче