Merging upstream version 1.39.0.

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

2 files changed, 8 insertions, 4 deletions

diff --git a/web/api/health/README.md b/web/api/health/README.md
index bfdd0ac68..dd46854a1 100644
--- a/web/api/health/README.md
+++ b/web/api/health/README.md
@@ -2,6 +2,10 @@
 title: "Health API Calls"
 date: 2020-04-27
 custom_edit_url: https://github.com/netdata/netdata/edit/master/web/api/health/README.md
+sidebar_label: "Health API Calls"
+learn_status: "Published"
+learn_topic_type: "References"
+learn_rel_path: "Developers/Web/Api"
 -->
 
 # Health API Calls
diff --git a/web/api/health/health_cmdapi.c b/web/api/health/health_cmdapi.c
index 7a939bc0f..7c4869bd3 100644
--- a/web/api/health/health_cmdapi.c
+++ b/web/api/health/health_cmdapi.c
@@ -121,7 +121,7 @@ int web_client_api_request_v1_mgmt_health(RRDHOST *host, struct web_client *w, c
 
     BUFFER *wb = w->response.data;
     buffer_flush(wb);
-    wb->contenttype = CT_TEXT_PLAIN;
+    wb->content_type = CT_TEXT_PLAIN;
 
     buffer_flush(w->response.data);
 
@@ -139,10 +139,10 @@ int web_client_api_request_v1_mgmt_health(RRDHOST *host, struct web_client *w, c
             ret = HTTP_RESP_FORBIDDEN;
         } else {
             while (url) {
-                char *value = mystrsep(&url, "&");
+                char *value = strsep_skip_consecutive_separators(&url, "&");
                 if (!value || !*value) continue;
 
-                char *key = mystrsep(&value, "=");
+                char *key = strsep_skip_consecutive_separators(&value, "=");
                 if (!key || !*key) continue;
                 if (!value || !*value) continue;
 
@@ -171,7 +171,7 @@ int web_client_api_request_v1_mgmt_health(RRDHOST *host, struct web_client *w, c
                         silencers->silencers = NULL;
                         buffer_strcat(wb, HEALTH_CMDAPI_MSG_RESET);
                     } else if (!strcmp(value, HEALTH_CMDAPI_CMD_LIST)) {
-                        w->response.data->contenttype = CT_APPLICATION_JSON;
+                        w->response.data->content_type = CT_APPLICATION_JSON;
                         health_silencers2json(wb);
                         config_changed=0;
                     }