unfolding: do not introduce additional lwsp

[modbot-urcm.git] / stump / bin / submission.pl

diff --git a/stump/bin/submission.pl b/stump/bin/submission.pl
index b1a7df4d8aee5bbadbedb8f65a91add7f91b5173..d19c3ba9eaa08d6f64a8d94964b3d759889dd2ca 100755 (executable)
--- a/stump/bin/submission.pl
+++ b/stump/bin/submission.pl
@@ -282,6 +282,9 @@ sub ignoreHeader {
   return 1 if( $header =~ /^Sender:/i );
   return 1 if( $header =~ /^In-Reply-To:/i );
   return 1 if( $header =~ /^Originator:/i );
+  return 1 if( $header =~ /^X-Trace:/i );
+  return 1 if( $header =~ /^X-Complaints-To:/i );
+  return 1 if( $header =~ /^NNTP-Posting-Date:/i );
 
   return 0;
 }
@@ -345,13 +348,15 @@ sub readMessage {
        # In these cases, keep that in $readahead for now,
        # and process the previous header, which is in $_.
        # But, first, a wrinkle ...
-       push @unfolded, (m/^[^:]+:/ ? $& : '????')
-           if s/\n(?=.)/ /g;
-       if (length $_ > 505) { #wtf
-         $_ = substr($_, 0, 500);
-         $_ =~ s/\n?$/\n/;
-         $readahead = $_;
-         $_ = $warning->("Next header truncated!");
+       if (!m/^(?:References):/i) {
+         push @unfolded, (m/^[^:]+:/ ? $& : '????')
+           if s/\n(?=.)//g;
+         if (length $_ > 505) { #wtf
+           $_ = substr($_, 0, 500);
+           $_ =~ s/\n?$/\n/;
+           $readahead = $_;
+           $_ = $warning->("Next header truncated!");
+         }
        }
       } else {
        # $_ is empty line at end of headers