X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FEml.pm;h=4d3fffc0387ae7653653dbae561ab03551789c29;hb=fdbd73069af6eed90030f97def61e669d8d0dc4c;hp=d2bd391554566d2e7939dfea36141e8660e013f5;hpb=ca68e519d588b1fd97d9d4a9c43bbb07534624c2;p=public-inbox.git

diff --git a/lib/PublicInbox/Eml.pm b/lib/PublicInbox/Eml.pm
index d2bd3915..4d3fffc0 100644
--- a/lib/PublicInbox/Eml.pm
+++ b/lib/PublicInbox/Eml.pm
@@ -129,7 +129,7 @@ sub new {
 sub new_sub {
 	my (undef, $ref) = @_;
 	# special case for messages like <85k5su9k59.fsf_-_@lola.goethe.zz>
-	$$ref =~ /\A(\r?\n)/s or goto &new;
+	$$ref =~ /\A(\r?\n)/s or return new(undef, $ref);
 	my $hdr = substr($$ref, 0, $+[0], ''); # sv_chop on $$ref
 	bless { hdr => \$hdr, crlf => $1, bdy => $ref }, __PACKAGE__;
 }
@@ -237,7 +237,7 @@ sub mp_descend ($$) {
 sub each_part {
 	my ($self, $cb, $arg, $once, $all) = @_;
 	my $p = mp_descend($self, $once // 0) or
-					return $cb->([$self, 0, 0], $arg);
+					return $cb->([$self, 0, 1], $arg);
 
 	$cb->([$self, 0, 0], $arg) if ($all || $self->{-call_cb}); # rare
 
@@ -368,14 +368,19 @@ sub header_str_set {
 	my ($self, $name, @vals) = @_;
 	for (@vals) {
 		next unless /[^\x20-\x7e]/;
-		utf8::encode($_); # to octets
 		# 39: int((75 - length("Subject: =?UTF-8?B?".'?=') ) / 4) * 3;
-		s/(.{1,39})/'=?UTF-8?B?'.encode_base64($1, '').'?='/ges;
+		s/(.{1,39})/
+			my $x = $1;
+			utf8::encode($x); # to octets
+			'=?UTF-8?B?'.encode_base64($x, '').'?='
+		/xges;
 	}
 	header_set($self, $name, @vals);
 }
 
-sub mhdr_decode ($) { eval { $MIME_Header->decode($_[0]) } // $_[0] }
+sub mhdr_decode ($) {
+	eval { $MIME_Header->decode($_[0], Encode::FB_DEFAULT) } // $_[0];
+}
 
 sub filename {
 	my $dis = header_raw($_[0], 'Content-Disposition');