projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #1454 from rubenk/libi2c-dev-mark-as-linux-only
[collectd.git]
/
src
/
curl.c
diff --git
a/src/curl.c
b/src/curl.c
index
1bbeddc
..
16ae3ab
100644
(file)
--- a/
src/curl.c
+++ b/
src/curl.c
@@
-327,7
+327,10
@@
static int cc_config_add_match (web_page_t *page, /* {{{ */
} /* while (status == 0) */
if (status != 0)
} /* while (status == 0) */
if (status != 0)
+ {
+ cc_web_match_free (match);
return (status);
return (status);
+ }
match->match = match_create_simple (match->regex, match->exclude_regex,
match->dstype);
match->match = match_create_simple (match->regex, match->exclude_regex,
match->dstype);
@@
-411,11
+414,12
@@
static int cc_page_init_curl (web_page_t *wp) /* {{{ */
if (wp->post_body != NULL)
curl_easy_setopt (wp->curl, CURLOPT_POSTFIELDS, wp->post_body);
if (wp->post_body != NULL)
curl_easy_setopt (wp->curl, CURLOPT_POSTFIELDS, wp->post_body);
+#ifdef HAVE_CURLOPT_TIMEOUT_MS
if (wp->timeout >= 0)
curl_easy_setopt (wp->curl, CURLOPT_TIMEOUT_MS, (long) wp->timeout);
else
if (wp->timeout >= 0)
curl_easy_setopt (wp->curl, CURLOPT_TIMEOUT_MS, (long) wp->timeout);
else
- curl_easy_setopt (wp->curl, CURLOPT_TIMEOUT_MS,
- CDTIME_T_TO_MS(plugin_get_interval()));
+ curl_easy_setopt (wp->curl, CURLOPT_TIMEOUT_MS,
(long) CDTIME_T_TO_MS(plugin_get_interval()));
+#endif
return (0);
} /* }}} int cc_page_init_curl */
return (0);
} /* }}} int cc_page_init_curl */
@@
-663,7
+667,7
@@
static int cc_read_page (web_page_t *wp) /* {{{ */
status = curl_easy_perform (wp->curl);
if (status != CURLE_OK)
{
status = curl_easy_perform (wp->curl);
if (status != CURLE_OK)
{
- ERROR ("curl plugin: curl_easy_perform failed with staus %i: %s",
+ ERROR ("curl plugin: curl_easy_perform failed with sta
t
us %i: %s",
status, wp->curl_errbuf);
return (-1);
}
status, wp->curl_errbuf);
return (-1);
}
@@
-676,7
+680,7
@@
static int cc_read_page (web_page_t *wp) /* {{{ */
long response_code = 0;
status = curl_easy_getinfo(wp->curl, CURLINFO_RESPONSE_CODE, &response_code);
if(status != CURLE_OK) {
long response_code = 0;
status = curl_easy_getinfo(wp->curl, CURLINFO_RESPONSE_CODE, &response_code);
if(status != CURLE_OK) {
- ERROR ("curl plugin: Fetching response code failed with staus %i: %s",
+ ERROR ("curl plugin: Fetching response code failed with sta
t
us %i: %s",
status, wp->curl_errbuf);
} else {
cc_submit_response_code(wp, response_code);
status, wp->curl_errbuf);
} else {
cc_submit_response_code(wp, response_code);