Mercurial > dovecot > core-2.2

changeset 1619:5bdda4147b36 HEAD

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fixes for handling missing Mime-Version
author Timo Sirainen <tss@iki.fi>
date Mon, 14 Jul 2003 02:01:06 +0300
parents 149ade487f48
children 124a42f0be3a
files src/lib-imap/imap-bodystructure.c
diffstat 1 files changed, 18 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/src/lib-imap/imap-bodystructure.c	Sun Jul 13 04:08:10 2003 +0300
+++ b/src/lib-imap/imap-bodystructure.c	Mon Jul 14 02:01:06 2003 +0300
@@ -240,13 +240,28 @@
 {
 	pool_t pool = context;
 	struct message_part_body_data *part_data;
+	struct message_part_envelope_data *envelope;
 	int parent_rfc822;
 
-	if (hdr == NULL || hdr->eoh)
+	if (hdr == NULL) {
+		/* If there was no Mime-Version, forget all the Content-stuff */
+		if ((part->flags & MESSAGE_PART_FLAG_IS_MIME) == 0 &&
+		    part->context != NULL) {
+			part_data = part->context;
+			envelope = part_data->envelope;
+
+			memset(part_data, 0, sizeof(*part_data));
+			part_data->pool = pool;
+			part_data->envelope = envelope;
+		}
+		return;
+	}
+
+	if (hdr->eoh)
 		return;
 
 	parent_rfc822 = part->parent != NULL &&
-		(part->parent->flags & MESSAGE_PART_FLAG_MESSAGE_RFC822);
+		(part->parent->flags & MESSAGE_PART_FLAG_MESSAGE_RFC822) != 0;
 	if (!parent_rfc822 && strncasecmp(hdr->name, "Content-", 8) != 0)
 		return;
 
@@ -260,8 +275,7 @@
 
 	t_push();
 
-	if ((part->flags & MESSAGE_PART_FLAG_IS_MIME) != 0)
-		parse_content_header(part_data, hdr, pool);
+	parse_content_header(part_data, hdr, pool);
 
 	if (parent_rfc822) {
 		/* message/rfc822, we need the envelope */