projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Statsd: avoid doing a division by zero when calculating the percentile with an empty...
[collectd.git]
/
src
/
ascent.c
diff --git
a/src/ascent.c
b/src/ascent.c
index
8829e51
..
6809bac
100644
(file)
--- a/
src/ascent.c
+++ b/
src/ascent.c
@@
-539,8
+539,9
@@
static int ascent_init (void) /* {{{ */
return (-1);
}
return (-1);
}
+ curl_easy_setopt (curl, CURLOPT_NOSIGNAL, 1L);
curl_easy_setopt (curl, CURLOPT_WRITEFUNCTION, ascent_curl_callback);
curl_easy_setopt (curl, CURLOPT_WRITEFUNCTION, ascent_curl_callback);
- curl_easy_setopt (curl, CURLOPT_USERAGENT,
PACKAGE_NAME"/"PACKAGE_VERSION
);
+ curl_easy_setopt (curl, CURLOPT_USERAGENT,
COLLECTD_USERAGENT
);
curl_easy_setopt (curl, CURLOPT_ERRORBUFFER, ascent_curl_error);
if (user != NULL)
curl_easy_setopt (curl, CURLOPT_ERRORBUFFER, ascent_curl_error);
if (user != NULL)
@@
-560,16
+561,18
@@
static int ascent_init (void) /* {{{ */
}
curl_easy_setopt (curl, CURLOPT_URL, url);
}
curl_easy_setopt (curl, CURLOPT_URL, url);
+ curl_easy_setopt (curl, CURLOPT_FOLLOWLOCATION, 1L);
+ curl_easy_setopt (curl, CURLOPT_MAXREDIRS, 50L);
- if ((verify_peer == NULL) ||
(strcmp (verify_peer, "true") == 0
))
- curl_easy_setopt (curl, CURLOPT_SSL_VERIFYPEER, 1);
+ if ((verify_peer == NULL) ||
IS_TRUE (verify_peer
))
+ curl_easy_setopt (curl, CURLOPT_SSL_VERIFYPEER, 1
L
);
else
else
- curl_easy_setopt (curl, CURLOPT_SSL_VERIFYPEER, 0);
+ curl_easy_setopt (curl, CURLOPT_SSL_VERIFYPEER, 0
L
);
- if ((verify_host == NULL) ||
(strcmp (verify_host, "true") == 0
))
- curl_easy_setopt (curl, CURLOPT_SSL_VERIFYHOST, 2);
+ if ((verify_host == NULL) ||
IS_TRUE (verify_host
))
+ curl_easy_setopt (curl, CURLOPT_SSL_VERIFYHOST, 2
L
);
else
else
- curl_easy_setopt (curl, CURLOPT_SSL_VERIFYHOST, 0);
+ curl_easy_setopt (curl, CURLOPT_SSL_VERIFYHOST, 0
L
);
if (cacert != NULL)
curl_easy_setopt (curl, CURLOPT_CAINFO, cacert);
if (cacert != NULL)
curl_easy_setopt (curl, CURLOPT_CAINFO, cacert);
@@
-594,7
+597,7
@@
static int ascent_read (void) /* {{{ */
}
ascent_buffer_fill = 0;
}
ascent_buffer_fill = 0;
- if (curl_easy_perform (curl) !=
0
)
+ if (curl_easy_perform (curl) !=
CURLE_OK
)
{
ERROR ("ascent plugin: curl_easy_perform failed: %s",
ascent_curl_error);
{
ERROR ("ascent plugin: curl_easy_perform failed: %s",
ascent_curl_error);