X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fnginx.c;h=d9529516331740741475b0baecacbc943af0700c;hb=e35f3c5c634216860f14586a7d17232022d8b588;hp=cea3c844c5eee6d33ee9b38071e003d196a2633a;hpb=37905c5a2370c8e6edae5011978773eeaa589d09;p=collectd.git diff --git a/src/nginx.c b/src/nginx.c index cea3c844..d9529516 100644 --- a/src/nginx.c +++ b/src/nginx.c @@ -119,6 +119,7 @@ static int init (void) return (-1); } + curl_easy_setopt (curl, CURLOPT_NOSIGNAL, 1); curl_easy_setopt (curl, CURLOPT_WRITEFUNCTION, nginx_curl_callback); curl_easy_setopt (curl, CURLOPT_USERAGENT, PACKAGE_NAME"/"PACKAGE_VERSION); curl_easy_setopt (curl, CURLOPT_ERRORBUFFER, nginx_curl_error); @@ -141,7 +142,9 @@ static int init (void) curl_easy_setopt (curl, CURLOPT_URL, url); } - if ((verify_peer == NULL) || (strcmp (verify_peer, "true") == 0)) + curl_easy_setopt (curl, CURLOPT_FOLLOWLOCATION, 1); + + if ((verify_peer == NULL) || IS_TRUE (verify_peer)) { curl_easy_setopt (curl, CURLOPT_SSL_VERIFYPEER, 1); } @@ -150,7 +153,7 @@ static int init (void) 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); }