You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by gb...@apache.org on 2019/11/13 17:44:00 UTC

svn commit: r1869761 - in /spamassassin: branches/3.4/lib/Mail/SpamAssassin/Plugin/HeaderEval.pm trunk/lib/Mail/SpamAssassin/Plugin/HeaderEval.pm

Author: gbechis
Date: Wed Nov 13 17:44:00 2019
New Revision: 1869761

URL: http://svn.apache.org/viewvc?rev=1869761&view=rev
Log:
fix SRS uri parser
bz #6089

Modified:
    spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/HeaderEval.pm
    spamassassin/trunk/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=1869761&r1=1869760&r2=1869761&view=diff
==============================================================================
--- spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/HeaderEval.pm (original)
+++ spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/HeaderEval.pm Wed Nov 13 17:44:00 2019
@@ -1060,7 +1060,7 @@ sub check_ratware_envelope_from {
   my $from = $pms->get('EnvelopeFrom:addr');
 
   return 0 if $from eq '' || $to eq '';
-  return 0 if $from =~ /^SRS\d=/i;
+  return 0 if $from =~ /^SRS\d[=+-]/i;
 
   if ($to =~ /^([^@]+)\@(.+)$/) {
     my($user,$dom) = ($1,$2);

Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/HeaderEval.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/HeaderEval.pm?rev=1869761&r1=1869760&r2=1869761&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/HeaderEval.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/HeaderEval.pm Wed Nov 13 17:44:00 2019
@@ -1070,7 +1070,7 @@ sub check_ratware_envelope_from {
   my $from = $pms->get('EnvelopeFrom:addr');
 
   return 0 if $from eq '' || $to eq '';
-  return 0 if $from =~ /^SRS\d=/i;
+  return 0 if $from =~ /^SRS\d[=+-]/i;
 
   if ($to =~ /^([^@]+)\@(.+)$/) {
     my($user,$dom) = ($1,$2);