From 60c0878c14c4b56d5c2a231172107af8c4addd0d Mon Sep 17 00:00:00 2001 From: Paul Fox Date: Fri, 7 Dec 2012 10:27:52 -0500 Subject: [PATCH] mhshow: properly treat unknown multipart subtypes as "mixed" Use default method to display this multipart content. Even unknown types are displayable, since they're treated as mixed per RFC 2046. --- uip/mhshowsbr.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/uip/mhshowsbr.c b/uip/mhshowsbr.c index c7923c8..7cf276a 100644 --- a/uip/mhshowsbr.c +++ b/uip/mhshowsbr.c @@ -560,14 +560,11 @@ show_multi(CT ct, int alternate) return show_multi_aux(ct, alternate, cp); /* - ** Use default method to display this multipart content - ** if it is not a (nested) part of a multipart/alternative, - ** or if it is one of the known subtypes of multipart. + ** Use default method to display this multipart content. Even + ** unknown types are displayable, since they're treated as mixed + ** per RFC 2046. */ - if (!alternate || ct->c_subtype != MULTI_UNKNOWN) - return show_multi_internal(ct, alternate); - - return NOTOK; + return show_multi_internal(ct, alternate); } -- 1.7.10.4