use warnings;
use strict;
-use locale;
use POSIX qw(strftime locale_h);
setlocale(LC_TIME, "C");
$_ = $hdr;
s/\n\s/ /g;
finish() if m/^x-loop: (\S+)$/i && $1 eq "$gMaintainerEmail";
- my $ins = !m/^subject:/i && !m/^reply-to:/i && !m/^return-path:/i
- && !m/^From / && !m/^X-Debbugs-/i;
+ my $ins = !m/^(?:(?:subject|reply-to|return-path|
+ mail-followup-to|
+ references):
+ |From\s|X-Debbugs-)/xi;
$fwd .= encode_utf8($hdr)."\n" if $ins;
# print {$debugfh} ">$_<\n";
if (s/^(\S+):\s*//) {
# Fixes #488554
$phline =~ s/\xef\xbb\xbf//g;
$phline =~ s/\N{U+FEFF}//g;
- last if $phline !~ m/^([\w-]+):\s*(\S.*)/;
+ last if $phline !~ m/^([\w-]+): # psuedoheader
+ (?:\s|\N{U+00A0})* # zero or more spaces, including
+ # non-breaking space
+ (\S.*)/x; # pseudoheader value
my ($fn, $fv) = ($1, $2);
$fv =~ s/\s*$//;
# pluralize tag/usertag
$resentcc= "Resent-CC: $resentccval\n";
}
+my $referencesval = join(' ',grep {defined $_} $header{'references'},$data->{msgid});
+my $references = '';
+if (!$newref && length($referencesval)) {
+ $references = "References: $referencesval\n";
+}
+
my $common_headers='';
{
my @tmp = @common_headers;
X-$gProject-PR-Message: report $ref
X-$gProject-PR-Package: $data->{package}
X-$gProject-PR-Keywords: $data->{keywords}
-${source_pr_header}
+${references}${source_pr_header}
END
chomp $enc_msg;
$enc_msg = encode_utf8($enc_msg).$fwd."\n";
X-$gProject-PR-Message: $report_followup $ref
X-$gProject-PR-Package: $data->{package}
X-$gProject-PR-Keywords: $data->{keywords}
-${source_pr_header}
+${references}${source_pr_header}
END
chomp $enc_msg;
$enc_msg = encode_utf8($enc_msg).$fwd."\n";
${common_headers}X-$gProject-PR-Message: $report_followup $ref
X-$gProject-PR-Package: $data->{package}
X-$gProject-PR-Keywords: $data->{keywords}
-${source_pr_header}
+${references}${source_pr_header}
END
chomp $enc_msg;
$enc_msg = encode_utf8($enc_msg).$fwd."\n";