Use MIME-Version instead of Mime-Version header, to conform to RFC 2045.
authorAndrej Kacian <andrej@kacian.sk>
Sat, 6 Jul 2013 00:32:32 +0000 (02:32 +0200)
committerAndrej Kacian <andrej@kacian.sk>
Sat, 6 Jul 2013 00:35:29 +0000 (02:35 +0200)
src/customheader.c
src/plugins/vcalendar/libical/libical/sspm.c
src/prefs_display_header.c
src/procmime.c

index f569344..554fb7d 100644 (file)
@@ -111,7 +111,7 @@ gboolean custom_header_is_allowed(const gchar *header)
            g_ascii_strcasecmp(header, "Message-ID")   != 0 &&
            g_ascii_strcasecmp(header, "In-Reply-To")  != 0 &&
            g_ascii_strcasecmp(header, "References")   != 0 &&
            g_ascii_strcasecmp(header, "Message-ID")   != 0 &&
            g_ascii_strcasecmp(header, "In-Reply-To")  != 0 &&
            g_ascii_strcasecmp(header, "References")   != 0 &&
-           g_ascii_strcasecmp(header, "Mime-Version") != 0 &&
+           g_ascii_strcasecmp(header, "MIME-Version") != 0 &&
            g_ascii_strcasecmp(header, "Content-Type") != 0 &&
            g_ascii_strcasecmp(header, "Content-Transfer-Encoding")
            != 0)
            g_ascii_strcasecmp(header, "Content-Type") != 0 &&
            g_ascii_strcasecmp(header, "Content-Transfer-Encoding")
            != 0)
index bd56a53..a9ae54f 100644 (file)
@@ -238,7 +238,7 @@ char *mime_headers[] = {
     "Content-Transfer-Encoding",
     "Content-Disposition",
     "Content-Id",
     "Content-Transfer-Encoding",
     "Content-Disposition",
     "Content-Id",
-    "Mime-Version",
+    "MIME-Version",
     0 
 };
 
     0 
 };
 
@@ -1590,7 +1590,7 @@ int sspm_write_mime(struct sspm_part *parts,size_t num_parts,
     }
 
     /* write mime-version header */
     }
 
     /* write mime-version header */
-    sspm_append_string(&buf,"Mime-Version: 1.0\n");
+    sspm_append_string(&buf,"MIME-Version: 1.0\n");
 
     /* End of header */
 
 
     /* End of header */
 
index 5ea5252..7a06e4a 100644 (file)
@@ -124,7 +124,7 @@ static gchar *defaults[] =
        "-Message-ID",
        "-In-Reply-To",
        "-References",
        "-Message-ID",
        "-In-Reply-To",
        "-References",
-       "-Mime-Version",
+       "-MIME-Version",
        "-Content-Type",
        "-Content-Transfer-Encoding",
        "-X-UIDL",
        "-Content-Type",
        "-Content-Transfer-Encoding",
        "-X-UIDL",
@@ -153,7 +153,7 @@ static gchar *defaults[] =
        "-Message-ID",
        "-In-Reply-To",
        "-References",
        "-Message-ID",
        "-In-Reply-To",
        "-References",
-       "-Mime-Version",
+       "-MIME-Version",
        "-Content-Type",
        "-Content-Transfer-Encoding",
        "-X-UIDL",
        "-Content-Type",
        "-Content-Transfer-Encoding",
        "-X-UIDL",
index 79dc7c3..4951f3c 100644 (file)
@@ -2464,7 +2464,7 @@ static gint procmime_write_message_rfc822(MimeInfo *mimeinfo, FILE *fp)
                                break;
                        if (skip && (buf[0] == ' ' || buf[0] == '\t'))
                                continue;
                                break;
                        if (skip && (buf[0] == ' ' || buf[0] == '\t'))
                                continue;
-                       if (g_ascii_strncasecmp(buf, "Mime-Version:", 13) == 0 ||
+                       if (g_ascii_strncasecmp(buf, "MIME-Version:", 13) == 0 ||
                            g_ascii_strncasecmp(buf, "Content-Type:", 13) == 0 ||
                            g_ascii_strncasecmp(buf, "Content-Transfer-Encoding:", 26) == 0 ||
                            g_ascii_strncasecmp(buf, "Content-Description:", 20) == 0 ||
                            g_ascii_strncasecmp(buf, "Content-Type:", 13) == 0 ||
                            g_ascii_strncasecmp(buf, "Content-Transfer-Encoding:", 26) == 0 ||
                            g_ascii_strncasecmp(buf, "Content-Description:", 20) == 0 ||
@@ -2502,7 +2502,7 @@ static gint procmime_write_message_rfc822(MimeInfo *mimeinfo, FILE *fp)
                return -1;
 
        child = (MimeInfo *) childnode->data;
                return -1;
 
        child = (MimeInfo *) childnode->data;
-       if (fprintf(fp, "Mime-Version: 1.0\n") < 0) {
+       if (fprintf(fp, "MIME-Version: 1.0\n") < 0) {
                g_warning("failed to write mime version");
                return -1;
        }
                g_warning("failed to write mime version");
                return -1;
        }