send-email: handle adjacent RFC 2047-encoded words properly

diff --git a/git-send-email.perl b/git-send-email.perl
index 106c2b065dfd6f29c5983d6944ec53cbb95490b0..cd327d704368300bc3c107df3b1ffd9dfd8c8f75 100755 (executable)
--- a/git-send-email.perl
+++ b/git-send-email.perl
@@ -912,17 +912,23 @@ sub make_message_id {
 sub unquote_rfc2047 {
        local ($_) = @_;
        my $charset;
-       s{$re_encoded_word}{
-               $charset = $1;
-               my $encoding = $2;
-               my $text = $3;
-               if ($encoding eq 'q' || $encoding eq 'Q') {
-                       $text =~ s/_/ /g;
-                       $text =~ s/=([0-9A-F]{2})/chr(hex($1))/egi;
-                       $text;
-               } else {
-                       $&; # other encodings not supported yet
+       my $sep = qr/[ \t]+/;
+       s{$re_encoded_word(?:$sep$re_encoded_word)*}{
+               my @words = split $sep, $&;
+               foreach (@words) {
+                       m/$re_encoded_word/;
+                       $charset = $1;
+                       my $encoding = $2;
+                       my $text = $3;
+                       if ($encoding eq 'q' || $encoding eq 'Q') {
+                               $_ = $text;
+                               s/_/ /g;
+                               s/=([0-9A-F]{2})/chr(hex($1))/egi;
+                       } else {
+                               # other encodings not supported yet
+                       }
                }
+               join '', @words;
        }eg;
        return wantarray ? ($_, $charset) : $_;
 }