svn commit: r1844340 - in /spamassassin/trunk/lib/Mail/SpamAssassin: PerMsgStatus.pm Plugin/HeaderEval.pm

[he...@apache.org]

Author: hege
Date: Fri Oct 19 13:11:01 2018
New Revision: 1844340

URL: http://svn.apache.org/viewvc?rev=1844340&view=rev
Log:
Clean up some get(ALL) calls

Modified:
    spamassassin/trunk/lib/Mail/SpamAssassin/PerMsgStatus.pm
    spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/HeaderEval.pm

Modified: spamassassin/trunk/lib/Mail/SpamAssassin/PerMsgStatus.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/PerMsgStatus.pm?rev=1844340&r1=1844339&r2=1844340&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/PerMsgStatus.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/PerMsgStatus.pm Fri Oct 19 13:11:01 2018
@@ -2891,7 +2891,7 @@ sub get_envelope_from {
   if ($envf = $self->get("X-Envelope-From")) {
     # heuristic: this could have been relayed via a list which then used
     # a *new* Envelope-from.  check
-    if ($self->get("ALL:raw") =~ /^Received:.*^X-Envelope-From:/smi) {
+    if ($self->get("ALL") =~ /^Received:.*^X-Envelope-From:/smi) {
       dbg("message: X-Envelope-From header found after 1 or more Received lines, cannot trust envelope-from");
       return;
     } else {
@@ -2903,7 +2903,7 @@ sub get_envelope_from {
   if ($envf = $self->get("Envelope-Sender")) {
     # heuristic: this could have been relayed via a list which then used
     # a *new* Envelope-from.  check
-    if ($self->get("ALL:raw") =~ /^Received:.*^Envelope-Sender:/smi) {
+    if ($self->get("ALL") =~ /^Received:.*^Envelope-Sender:/smi) {
       dbg("message: Envelope-Sender header found after 1 or more Received lines, cannot trust envelope-from");
     } else {
       goto ok;
@@ -2920,7 +2920,7 @@ sub get_envelope_from {
   if ($envf = $self->get("Return-Path")) {
     # heuristic: this could have been relayed via a list which then used
     # a *new* Envelope-from.  check
-    if ($self->get("ALL:raw") =~ /^Received:.*^Return-Path:/smi) {
+    if ($self->get("ALL") =~ /^Received:.*^Return-Path:/smi) {
       dbg("message: Return-Path header found after 1 or more Received lines, cannot trust envelope-from");
     } else {
       goto ok;

Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/HeaderEval.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/HeaderEval.pm?rev=1844340&r1=1844339&r2=1844340&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/HeaderEval.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/HeaderEval.pm Fri Oct 19 13:11:01 2018
@@ -273,8 +273,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;
   }
 
@@ -1048,7 +1047,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