diff --git a/src/nginx.c b/src/nginx.c
index ea5c126318f05acdb4784ee9856ab8b5061003aa..53137a71d206dd5ec9218d9697a963a6085c8db3 100644 (file)
--- a/src/nginx.c
+++ b/src/nginx.c
};
static int config_keys_num = STATIC_ARRAY_SIZE (config_keys);
};
static int config_keys_num = STATIC_ARRAY_SIZE (config_keys);
-static size_t nginx_curl_callback (void *buf, size_t size, size_t nmemb, void *stream)
+static size_t nginx_curl_callback (void *buf, size_t size, size_t nmemb,
+ void __attribute__((unused)) *stream)
{
size_t len = size * nmemb;
{
size_t len = size * nmemb;
if (user != NULL)
{
if (user != NULL)
{
- if (ssnprintf (credentials, sizeof (credentials),
- "%s:%s", user, pass == NULL ? "" : pass) >= sizeof (credentials))
+ int status = ssnprintf (credentials, sizeof (credentials),
+ "%s:%s", user, pass == NULL ? "" : pass);
+ if ((status < 0) || ((size_t) status >= sizeof (credentials)))
{
ERROR ("nginx plugin: Credentials would have been truncated.");
return (-1);
{
ERROR ("nginx plugin: Credentials would have been truncated.");
return (-1);
curl_easy_setopt (curl, CURLOPT_URL, url);
}
curl_easy_setopt (curl, CURLOPT_URL, url);
}
+ curl_easy_setopt (curl, CURLOPT_FOLLOWLOCATION, 1);
+
if ((verify_peer == NULL) || (strcmp (verify_peer, "true") == 0))
{
curl_easy_setopt (curl, CURLOPT_SSL_VERIFYPEER, 1);
if ((verify_peer == NULL) || (strcmp (verify_peer, "true") == 0))
{
curl_easy_setopt (curl, CURLOPT_SSL_VERIFYPEER, 1);
vl.values = values;
vl.values_len = 1;
vl.values = values;
vl.values_len = 1;
- vl.time = time (NULL);
sstrncpy (vl.host, hostname_g, sizeof (vl.host));
sstrncpy (vl.plugin, "nginx", sizeof (vl.plugin));
sstrncpy (vl.plugin_instance, "", sizeof (vl.plugin_instance));
sstrncpy (vl.host, hostname_g, sizeof (vl.host));
sstrncpy (vl.plugin, "nginx", sizeof (vl.plugin));
sstrncpy (vl.plugin_instance, "", sizeof (vl.plugin_instance));