projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
curl plugin: Fix memory leak.
[collectd.git]
/
src
/
apache.c
diff --git
a/src/apache.c
b/src/apache.c
index
202b73c
..
16f7acd
100644
(file)
--- a/
src/apache.c
+++ b/
src/apache.c
@@
-78,6
+78,7
@@
static void apache_free (apache_t *st)
curl_easy_cleanup(st->curl);
st->curl = NULL;
}
curl_easy_cleanup(st->curl);
st->curl = NULL;
}
+ sfree (st);
} /* apache_free */
static size_t apache_curl_callback (void *buf, size_t size, size_t nmemb,
} /* apache_free */
static size_t apache_curl_callback (void *buf, size_t size, size_t nmemb,
@@
-426,6
+427,7
@@
static int init_host (apache_t *st) /* {{{ */
curl_easy_setopt (st->curl, CURLOPT_URL, st->url);
curl_easy_setopt (st->curl, CURLOPT_FOLLOWLOCATION, 1L);
curl_easy_setopt (st->curl, CURLOPT_URL, st->url);
curl_easy_setopt (st->curl, CURLOPT_FOLLOWLOCATION, 1L);
+ curl_easy_setopt (st->curl, CURLOPT_MAXREDIRS, 50L);
if (st->verify_peer != 0)
{
if (st->verify_peer != 0)
{
@@
-611,7
+613,7
@@
static int apache_read_host (user_data_t *user_data) /* {{{ */
assert (st->curl != NULL);
st->apache_buffer_fill = 0;
assert (st->curl != NULL);
st->apache_buffer_fill = 0;
- if (curl_easy_perform (st->curl) !=
0
)
+ if (curl_easy_perform (st->curl) !=
CURLE_OK
)
{
ERROR ("apache: curl_easy_perform failed: %s",
st->apache_curl_error);
{
ERROR ("apache: curl_easy_perform failed: %s",
st->apache_curl_error);
@@
-670,9
+672,18
@@
static int apache_read_host (user_data_t *user_data) /* {{{ */
return (0);
} /* }}} int apache_read_host */
return (0);
} /* }}} int apache_read_host */
+static int apache_init (void) /* {{{ */
+{
+ /* Call this while collectd is still single-threaded to avoid
+ * initialization issues in libgcrypt. */
+ curl_global_init (CURL_GLOBAL_SSL);
+ return (0);
+} /* }}} int apache_init */
+
void module_register (void)
{
plugin_register_complex_config ("apache", config);
void module_register (void)
{
plugin_register_complex_config ("apache", config);
+ plugin_register_init ("apache", apache_init);
} /* void module_register */
/* vim: set sw=8 noet fdm=marker : */
} /* void module_register */
/* vim: set sw=8 noet fdm=marker : */