Don't RFC1522 escape ", ( and ). (Closes: #588859). Thanks to Glenn

[debbugs.git] / Debbugs / MIME.pm

diff --git a/Debbugs/MIME.pm b/Debbugs/MIME.pm
index 95dafb8dc5075ed9a515143c00dd8e584e653bb0..c2faeaa8621b3f5c580beb5c450425c1d39f9b6c 100644 (file)
--- a/Debbugs/MIME.pm
+++ b/Debbugs/MIME.pm
@@ -288,8 +288,10 @@ sub encode_rfc1522 {
      return undef if not defined $rawstr;
      # We process words in reverse so we can preserve spacing between
      # encoded words. This regex splits on word|nonword boundaries and
-     # nonword|nonword boundaries.
-     my @words = reverse split /(?:(?<=[\s\n])|(?=[\s\n]))/m, $rawstr;
+     # nonword|nonword boundaries. We also consider parenthesis and "
+     # to be nonwords to avoid escaping them in comments in violation
+     # of RFC1522
+     my @words = reverse split /(?:(?<=[\s\n\)\(\"])|(?=[\s\n\)\(\"]))/m, $rawstr;
 
      my $previous_word_encoded = 0;
      my $string = '';