From: Philipp Takacs <philipp@bureaucracy.de>
Date: Tue, 22 Nov 2016 16:15:58 +0000 (+0100)
Subject: Accept binary encoding for messages/*
X-Git-Tag: mmh-0.4~50
X-Git-Url: http://git.marmaro.de/?p=mmh;a=commitdiff_plain;h=79cbafe7268202d5b9c231b2d25472c152caa709;hp=30cd04b718c568c8c327bc32c5700a3a1f403be4;ds=sidebyside

Accept binary encoding for messages/*

Acording to RFC 2046 binary encoding is allowed for messages/*.
Also ignore other encodings.
---

diff --git a/uip/mhparse.c b/uip/mhparse.c
index b0876eb..8e8b360 100644
--- a/uip/mhparse.c
+++ b/uip/mhparse.c
@@ -1025,7 +1025,7 @@ InitMultiPart(CT ct)
 	*/
 	if (ct->c_encoding != CE_7BIT && ct->c_encoding != CE_8BIT
 		&& ct->c_encoding != CE_BINARY) {
-		admonish(NULL, "\"%s/%s\" type in message %s must be encoded in 7bit, 8bit, or binary", ci->ci_type, ci->ci_subtype, ct->c_file);
+		admonish(NULL, "\"%s/%s\" type in message %s should be encoded in 7bit, 8bit, or binary", ci->ci_type, ci->ci_subtype, ct->c_file);
 		ct->c_encoding = CE_7BIT;
 	}
 
@@ -1243,9 +1243,9 @@ InitMessage(CT ct)
 	struct k2v *kv;
 	CI ci = &ct->c_ctinfo;
 
-	if ((ct->c_encoding != CE_7BIT) && (ct->c_encoding != CE_8BIT)) {
-		admonish(NULL, "\"%s/%s\" type in message %s should be encoded in 7bit or 8bit", ci->ci_type, ci->ci_subtype, ct->c_file);
-		return NOTOK;
+	if ((ct->c_encoding != CE_7BIT) && (ct->c_encoding != CE_8BIT) && (ct->c_encoding != CE_BINARY)) {
+		admonish(NULL, "\"%s/%s\" type in message %s should be encoded in 7bit, 8bit, or binary", ci->ci_type, ci->ci_subtype, ct->c_file);
+		ct->c_encoding = CE_7BIT;
 	}
 
 	/* check for missing subtype */