strip out Mail-Followup-To

diff --git a/debian/changelog b/debian/changelog
index 775e8760f61a74f08b367b181f5f35b9d92ada90..41458cf46c0b4b938be0908167e1b7d2c2f0cc30 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -56,6 +56,7 @@ debbugs (2.6.0~exp1) UNRELEASED; urgency=low
   * Add envelope_from configuration variable so sites can set a valid return
     path if the sendmail default is wrong. (Closes: #719205)
   * Fix links to merged and blocked bugs. (Closes: #539691)
+  * Strip out Mail-Followup-To: (Closes: #798092)
 
   [ Niels Thykier ]
   * quitcgi() now returns 400/500 status codes instead of 200 (Closes: #584922)

diff --git a/scripts/process b/scripts/process
index 95d933d7a1caa67e76a3a0d74091a693ea010144..228d28ad32fc6166e8c52b9cd025aa0fdbfe8d32 100755 (executable)
--- a/scripts/process
+++ b/scripts/process
@@ -180,8 +180,8 @@ for my $hdr (@headerlines) {
     $_ = $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):
+                |From\s|X-Debbugs-)/xi;
     $fwd .= encode_utf8($hdr)."\n" if $ins;
     # print {$debugfh} ">$_<\n";
     if (s/^(\S+):\s*//) {