diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-08-26 08:15:24 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-08-26 08:15:35 +0000 |
| commit | f09848204fa5283d21ea43e262ee41aa578e1808 (patch) | |
| tree | c62385d7adf209fa6a798635954d887f718fb3fb /src/web | |
| parent | Releasing debian version 1.46.3-2. (diff) | |
| download | netdata-f09848204fa5283d21ea43e262ee41aa578e1808.tar.xz netdata-f09848204fa5283d21ea43e262ee41aa578e1808.zip | |
Merging upstream version 1.47.0.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'src/web')
| -rw-r--r-- | src/web/api/queries/query.c | 2 | ||||
| -rw-r--r-- | src/web/api/web_api_v1.c | 5 | ||||
| -rw-r--r-- | src/web/server/web_client.c | 2 |
3 files changed, 6 insertions, 3 deletions
diff --git a/src/web/api/queries/query.c b/src/web/api/queries/query.c index c97b546b..6854300f 100644 --- a/src/web/api/queries/query.c +++ b/src/web/api/queries/query.c @@ -691,7 +691,7 @@ static void rrdr_set_grouping_function(RRDR *r, RRDR_TIME_GROUPING group_method) } } if(!found) { - errno = 0; + errno_clear(); internal_error(true, "QUERY: grouping method %u not found. Using 'average'", (unsigned int)group_method); r->time_grouping.create = tg_average_create; r->time_grouping.reset = tg_average_reset; diff --git a/src/web/api/web_api_v1.c b/src/web/api/web_api_v1.c index 1884f1fe..bfaa4f6f 100644 --- a/src/web/api/web_api_v1.c +++ b/src/web/api/web_api_v1.c @@ -1422,10 +1422,13 @@ static int web_client_api_request_v1_aclk_state(RRDHOST *host, struct web_client BUFFER *wb = w->response.data; buffer_flush(wb); - +#ifdef ENABLE_ACLK char *str = aclk_state_json(); buffer_strcat(wb, str); freez(str); +#else + buffer_strcat(wb, "{\"aclk-available\":false}"); +#endif wb->content_type = CT_APPLICATION_JSON; buffer_no_cacheable(wb); diff --git a/src/web/server/web_client.c b/src/web/server/web_client.c index 27fcf29c..ca1c28e7 100644 --- a/src/web/server/web_client.c +++ b/src/web/server/web_client.c @@ -1855,7 +1855,7 @@ ssize_t web_client_receive(struct web_client *w) // do we have any space for more data? buffer_need_bytes(w->response.data, NETDATA_WEB_REQUEST_INITIAL_SIZE); - errno = 0; + errno_clear(); #ifdef ENABLE_HTTPS if ( (web_client_check_conn_tcp(w)) && (netdata_ssl_web_server_ctx) ) { |