ENGINE-920: compare undashed utf8

2 years ago · bf16e3081a
parent 50791d7c39
commit bf16e3081a
1 changed files with 2 additions and 1 deletions
--- a/src/etpan_mime.c
+++ b/src/etpan_mime.c
@ -2782,7 +2782,8 @@ static PEP_STATUS interpret_body(struct mailmime *part, char **longmsg, size_t *

    if (part->mm_content_type) {
        if (_get_content_type(part->mm_content_type, &type, &charset) == 0) {
-            if (charset && strncasecmp(charset, "utf-8", 5) != 0) {
+            // We can be more elegant about this later.
+            if (charset && (strncasecmp(charset, "utf-8", 5) != 0 || strncasecmp(charset, "utf8", 4) != 0)) {
                char * _text;
                int r = charconv("utf-8", charset, _longmsg, _size, &_text);
                switch (r) {