Merging upstream version 1.47.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

4 files changed, 6 insertions, 6 deletions

diff --git a/src/streaming/receiver.c b/src/streaming/receiver.c
index 2cbf247d..50da031a 100644
--- a/src/streaming/receiver.c
+++ b/src/streaming/receiver.c
@@ -70,7 +70,7 @@ static inline int read_stream(struct receiver_state *r, char* buffer, size_t siz
     ssize_t bytes_read;
 
     do {
-        errno = 0;
+        errno_clear();
 
         switch(wait_on_socket_or_cancel_with_timeout(
 #ifdef ENABLE_HTTPS
diff --git a/src/streaming/rrdpush.c b/src/streaming/rrdpush.c
index 1ce8e4ea..23a86e72 100644
--- a/src/streaming/rrdpush.c
+++ b/src/streaming/rrdpush.c
@@ -54,7 +54,7 @@ char *netdata_ssl_ca_file = NULL;
 #endif
 
 static void load_stream_conf() {
-    errno = 0;
+    errno_clear();
     char *filename = strdupz_path_subpath(netdata_configured_user_config_dir, "stream.conf");
     if(!appconfig_load(&stream_config, filename, 0, NULL)) {
         nd_log_daemon(NDLP_NOTICE, "CONFIG: cannot load user config '%s'. Will try stock config.", filename);
diff --git a/src/streaming/sender.c b/src/streaming/sender.c
index 3432e692..a5fbe604 100644
--- a/src/streaming/sender.c
+++ b/src/streaming/sender.c
@@ -1894,7 +1894,7 @@ void *rrdpush_sender_thread(void *ptr) {
         // protection from overflow
         if(unlikely(s->flags & SENDER_FLAG_OVERFLOW)) {
             worker_is_busy(WORKER_SENDER_JOB_DISCONNECT_OVERFLOW);
-            errno = 0;
+            errno_clear();
             netdata_log_error("STREAM %s [send to %s]: buffer full (allocated %zu bytes) after sending %zu bytes. Restarting connection",
                   rrdhost_hostname(s->host), s->connected_to, s->buffer->size, s->sent_bytes_on_this_connection);
             rrdpush_sender_thread_close_socket(s->host);
diff --git a/src/streaming/stream.conf b/src/streaming/stream.conf
index 9dc154e2..475d5eac 100644
--- a/src/streaming/stream.conf
+++ b/src/streaming/stream.conf
@@ -32,6 +32,9 @@
     # This communication is not HTTP (it cannot be proxied by web proxies).
     destination =
 
+    # The API_KEY to use (as the sender)
+    api key =
+
     # Skip Certificate verification?
     # The netdata child is configurated to avoid invalid SSL/TLS certificate,
     # so certificates that are self-signed or expired will stop the streaming.
@@ -53,9 +56,6 @@
     #
     #CAfile =
 
-    # The API_KEY to use (as the sender)
-    api key =
-
     # Stream Compression
     # The default is enabled
     # You can control stream compression in this agent with options: yes | no