X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fascent.c;h=993e480cb1746b0464741967eb6340921365ca7b;hb=e35f3c5c634216860f14586a7d17232022d8b588;hp=8829e518f3fbfef289b9d74d368fe7ffc1de7bbf;hpb=6d86a97190a193863aadc252f20f6b9dba61c263;p=collectd.git diff --git a/src/ascent.c b/src/ascent.c index 8829e518..993e480c 100644 --- a/src/ascent.c +++ b/src/ascent.c @@ -539,6 +539,7 @@ static int ascent_init (void) /* {{{ */ return (-1); } + curl_easy_setopt (curl, CURLOPT_NOSIGNAL, 1); curl_easy_setopt (curl, CURLOPT_WRITEFUNCTION, ascent_curl_callback); curl_easy_setopt (curl, CURLOPT_USERAGENT, PACKAGE_NAME"/"PACKAGE_VERSION); curl_easy_setopt (curl, CURLOPT_ERRORBUFFER, ascent_curl_error); @@ -560,13 +561,14 @@ static int ascent_init (void) /* {{{ */ } curl_easy_setopt (curl, CURLOPT_URL, url); + curl_easy_setopt (curl, CURLOPT_FOLLOWLOCATION, 1); - if ((verify_peer == NULL) || (strcmp (verify_peer, "true") == 0)) + if ((verify_peer == NULL) || IS_TRUE (verify_peer)) curl_easy_setopt (curl, CURLOPT_SSL_VERIFYPEER, 1); else curl_easy_setopt (curl, CURLOPT_SSL_VERIFYPEER, 0); - if ((verify_host == NULL) || (strcmp (verify_host, "true") == 0)) + if ((verify_host == NULL) || IS_TRUE (verify_host)) curl_easy_setopt (curl, CURLOPT_SSL_VERIFYHOST, 2); else curl_easy_setopt (curl, CURLOPT_SSL_VERIFYHOST, 0);