user/dev discussion of public-inbox itself
 help / color / mirror / code / Atom feed
From: Eric Wong <e@80x24.org>
To: meta@public-inbox.org
Subject: [PATCH] view: handle missing Content-Type in message
Date: Thu,  8 Sep 2016 19:53:27 +0000	[thread overview]
Message-ID: <20160908195327.28040-1-e@80x24.org> (raw)

Email::MIME internally assumes "text/plain" for messages
missing a Content-Type, but does not expose that in the
Email::MIME::content_type API method.  We must assume it
ourselves to avoid uninitialized value warnings for the
rare (nowadays) MUAs which do not set it.
---
 lib/PublicInbox/View.pm | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/lib/PublicInbox/View.pm b/lib/PublicInbox/View.pm
index 6997c1c..9359209 100644
--- a/lib/PublicInbox/View.pm
+++ b/lib/PublicInbox/View.pm
@@ -413,7 +413,6 @@ sub attach_link ($$$$;$) {
 	my $nl = $idx[-1] > 1 ? "\n" : '';
 	my $idx = join('.', @idx);
 	my $size = bytes::length($part->body);
-	$ct ||= 'text/plain';
 
 	# hide attributes normally, unless we want to aid users in
 	# spotting MUA problems:
@@ -444,10 +443,10 @@ sub attach_link ($$$$;$) {
 sub add_text_body {
 	my ($upfx, $p) = @_; # from msg_iter: [ Email::MIME, depth, @idx ]
 	my ($part, $depth, @idx) = @$p;
-	my $ct = $part->content_type;
+	my $ct = $part->content_type || 'text/plain';
 	my $fn = $part->filename;
 
-	if (defined $ct && $ct =~ m!\btext/x?html\b!i) {
+	if ($ct =~ m!\btext/x?html\b!i) {
 		return attach_link($upfx, $ct, $p, $fn);
 	}
 
-- 
EW


                 reply	other threads:[~2016-09-08 19:53 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: http://public-inbox.org/README

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20160908195327.28040-1-e@80x24.org \
    --to=e@80x24.org \
    --cc=meta@public-inbox.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://80x24.org/public-inbox.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).