Properly indicate UTF-8 charset in HTML and JSON HTTP responses

catalinii · Aug 7, 2024 · e6d0be4 · e6d0be4
1 parent ff5985f
commit e6d0be4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/minisatip.c b/src/minisatip.c
@@ -1594,7 +1594,7 @@ int read_http(sockets *s) {
         int len =
             get_json_state(buf, JSON_STATE_MAXLEN, sbuf, JSON_STRING_MAXLEN);
         http_response(s, 200,
-                      "Content-Type: application/json\r\n"
+                      "Content-Type: application/json; charset=utf-8\r\n"
                       "Connection: close\r\n"
                       "Access-Control-Allow-Origin: *",
                       buf, 0, len);
@@ -1607,7 +1607,7 @@ int read_http(sockets *s) {
         char *buf = _malloc(JSON_BANDWIDTH_MAXLEN);
         int len = get_json_bandwidth(buf, JSON_BANDWIDTH_MAXLEN);
         http_response(s, 200,
-                      "Content-Type: application/json\r\n"
+                      "Content-Type: application/json; charset=utf-8\r\n"
                       "Connection: close\r\n"
                       "Access-Control-Allow-Origin: *",
                       buf, 0, len);

diff --git a/src/utils.c b/src/utils.c
@@ -487,12 +487,12 @@ char *readfile(char *fn, char *ctype, int *len) {
                           "text/javascript\r\nConnection: close");
         else if (endswith(fn, "htm") || endswith(fn, "html"))
             strcpy(ctype, "Cache-Control: max-age=3600\r\nContent-type: "
-                          "text/html\r\nConnection: close");
+                          "text/html; charset=utf-8\r\nConnection: close");
         else if (endswith(fn, "xml"))
             strcpy(ctype, "Cache-Control: no-cache\r\nContent-type: text/xml");
         else if (endswith(fn, "json"))
             strcpy(ctype, "Cache-Control: no-cache\r\nContent-type: "
-                          "application/json");
+                          "application/json; charset=utf-8");
         else if (endswith(fn, "m3u"))
             strcpy(ctype,
                    "Cache-Control: no-cache\r\nContent-type: video/x-mpegurl");