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/22 09:49:44 UTC

svn commit: r1844541 - in /spamassassin/trunk/lib/Mail/SpamAssassin: Locales.pm Plugin/Hashcash.pm Plugin/HeaderEval.pm Plugin/WLBLEval.pm Plugin/WhiteListSubject.pm

Author: hege
Date: Mon Oct 22 09:49:44 2018
New Revision: 1844541

URL: http://svn.apache.org/viewvc?rev=1844541&view=rev
Log:
Remove deprecated "study" op

Modified:
    spamassassin/trunk/lib/Mail/SpamAssassin/Locales.pm
    spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/Hashcash.pm
    spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/HeaderEval.pm
    spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/WLBLEval.pm
    spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/WhiteListSubject.pm

Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Locales.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Locales.pm?rev=1844541&r1=1844540&r2=1844541&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Locales.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Locales.pm Mon Oct 22 09:49:44 2018
@@ -76,9 +76,6 @@ sub is_charset_ok_for_locales {
   $cs =~ s/^3D//gs;		# broken by quoted-printable
   $cs =~ s/:.*$//gs;            # trim off multiple charsets, just use 1st
 
-  study $cs;  # study is a no-op since perl 5.16.0, eliminating related bugs
-  #warn "JMD $cs";
-
   # always OK (the net speaks mostly roman charsets)
   return 1 if ($cs eq 'USASCII');
   return 1 if ($cs =~ /^ISO8859/);

Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/Hashcash.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/Hashcash.pm?rev=1844541&r1=1844540&r2=1844541&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/Hashcash.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/Hashcash.pm Mon Oct 22 09:49:44 2018
@@ -324,8 +324,6 @@ sub _check_hashcash_resource {
   my ($self, $scanner, $list, $addr) = @_;
   $addr = lc $addr;
   if (defined ($list->{$addr})) { return 1; }
-  study $addr;  # study is a no-op since perl 5.16.0, eliminating related bugs
-
   foreach my $regexp (values %{$list})
   {
     # allow %u == current username

Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/HeaderEval.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/HeaderEval.pm?rev=1844541&r1=1844540&r2=1844541&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/HeaderEval.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/HeaderEval.pm Mon Oct 22 09:49:44 2018
@@ -141,7 +141,6 @@ sub check_for_unique_subject_id {
   my ($self, $pms) = @_;
   local ($_);
   $_ = lc $pms->get('Subject');
-  study;  # study is a no-op since perl 5.16.0, eliminating related bugs
 
   my $id = 0;
   if (/[-_\.\s]{7,}([-a-z0-9]{4,})$/

Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/WLBLEval.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/WLBLEval.pm?rev=1844541&r1=1844540&r2=1844541&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/WLBLEval.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/WLBLEval.pm Mon Oct 22 09:49:44 2018
@@ -407,7 +407,6 @@ sub _check_whitelist {
   my ($self, $list, $addr) = @_;
   $addr = lc $addr;
   if (defined ($list->{$addr})) { return 1; }
-  study $addr;  # study is a no-op since perl 5.16.0, eliminating related bugs
   foreach my $regexp (values %{$list}) {
     if ($addr =~ qr/$regexp/i) {
       dbg("rules: address $addr matches whitelist or blacklist regexp: $regexp");

Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/WhiteListSubject.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/WhiteListSubject.pm?rev=1844541&r1=1844540&r2=1844541&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/WhiteListSubject.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/WhiteListSubject.pm Mon Oct 22 09:49:44 2018
@@ -135,7 +135,6 @@ sub _check_subject {
 
   return 1 if defined($list->{$subject});
 
-  study $subject;  # study is a no-op since perl 5.16.0, eliminating bugs
   foreach my $regexp (values %{$list}) {
     if ($subject =~ qr/$regexp/i) {
       return 1;