projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'collectd-4.8' into collectd-4.9
[collectd.git]
/
src
/
nginx.c
diff --git
a/src/nginx.c
b/src/nginx.c
index
cea3c84
..
6976842
100644
(file)
--- a/
src/nginx.c
+++ b/
src/nginx.c
@@
-141,7
+141,9
@@
static int init (void)
curl_easy_setopt (curl, CURLOPT_URL, url);
}
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);
}
{
curl_easy_setopt (curl, CURLOPT_SSL_VERIFYPEER, 1);
}
@@
-150,7
+152,7
@@
static int init (void)
curl_easy_setopt (curl, CURLOPT_SSL_VERIFYPEER, 0);
}
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);
}
{
curl_easy_setopt (curl, CURLOPT_SSL_VERIFYHOST, 2);
}