You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by he...@apache.org on 2018/10/20 03:05:09 UTC

svn commit: r1844385 - /spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/HeaderEval.pm

Author: hege
Date: Sat Oct 20 03:05:08 2018
New Revision: 1844385

URL: http://svn.apache.org/viewvc?rev=1844385&view=rev
Log:
Sync with trunk, ALL fixes

Modified:
    spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/HeaderEval.pm

Modified: spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/HeaderEval.pm
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/HeaderEval.pm?rev=1844385&r1=1844384&r2=1844385&view=diff
==============================================================================
--- spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/HeaderEval.pm (original)
+++ spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/HeaderEval.pm Sat Oct 20 03:05:08 2018
@@ -272,8 +272,7 @@ sub check_illegal_chars {
 
   # avoid overlap between tests
   if ($header eq "ALL") {
-    # fix continuation lines, then remove Subject and From
-    $str =~ s/\n[ \t]+/  /gs;
+    # Remove Subject and From
     $str =~ s/^(?:Subject|From):.*$//gmi;
   }
 
@@ -1035,7 +1034,6 @@ sub check_unresolved_template {
   my ($self, $pms) = @_;
 
   my $all = $pms->get('ALL');	# cached access
-  $all =~ s/\n[ \t]+/ /gs;	# fix continuation lines
   
   for my $header (split(/\n/, $all)) {
     # slightly faster to test in this order
@@ -1070,7 +1068,7 @@ sub check_ratware_envelope_from {
   return 0 if $from eq '' || $to eq '';
   return 0 if $from =~ /^SRS\d=/;
 
-  if ($to =~ /^([^@]+)@(.+)$/) {
+  if ($to =~ /^([^@]+)\@(.+)$/) {
     my($user,$dom) = ($1,$2);
     $dom = $self->{main}->{registryboundaries}->trim_domain($dom);
     return unless