svn commit: r1889706 - in /spamassassin/trunk/lib/Mail/SpamAssassin: Conf.pm Conf/Parser.pm

[he...@apache.org]

Author: hege
Date: Sun May  9 16:07:07 2021
New Revision: 1889706

URL: http://svn.apache.org/viewvc?rev=1889706&view=rev
Log:
Shave another 50ms from parsing

Modified:
    spamassassin/trunk/lib/Mail/SpamAssassin/Conf.pm
    spamassassin/trunk/lib/Mail/SpamAssassin/Conf/Parser.pm

Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Conf.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Conf.pm?rev=1889706&r1=1889705&r2=1889706&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Conf.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Conf.pm Sun May  9 16:07:07 2021
@@ -5177,7 +5177,7 @@ sub maybe_header_only {
   my($self,$rulename) = @_;
   my $type = $self->{test_types}->{$rulename};
 
-  if ($rulename =~ /^AUTOLEARNTEST/) {
+  if (index($rulename, 'AUTOLEARNTEST') == 0) {
     dbg("config: auto-learn: $rulename - Test type is $self->{test_types}->{$rulename}.");
   }
  
@@ -5201,7 +5201,7 @@ sub maybe_body_only {
   my($self,$rulename) = @_;
   my $type = $self->{test_types}->{$rulename};
 
-  if ($rulename =~ /^AUTOLEARNTEST/) {
+  if (index($rulename, 'AUTOLEARNTEST') == 0) {
     dbg("config: auto-learn: $rulename - Test type is $self->{test_types}->{$rulename}.");
   }
 

Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Conf/Parser.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Conf/Parser.pm?rev=1889706&r1=1889705&r2=1889706&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Conf/Parser.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Conf/Parser.pm Sun May  9 16:07:07 2021
@@ -261,7 +261,7 @@ sub parse {
       }
 
       # bug 6800: let X-Spam-Checker-Version also show what sa-update we are at
-      if ($line =~ /^\# UPDATE version (\d+)$/) {
+      if (index($line, '# UPD') == 0 && $line =~ /^\# UPDATE version (\d+)$/) {
         for ($self->{currentfile}) {  # just aliasing, not a loop
           $conf->{update_version}{$_} = $1  if defined $_ && $_ ne '(no file)';
         }
@@ -276,7 +276,9 @@ sub parse {
     next unless($line); # skip empty lines
 
     # handle i18n
-    if ($line =~ s/^lang\s+(\S+)\s+//) { next if ($lang !~ /^$1/i); }
+    if (index($line, 'lang') == 0 && $line =~ s/^lang\s+(\S+)\s+//) {
+      next if $lang !~ /^$1/i;
+    }
 
     my($key, $value) = split(/\s+/, $line, 2);
     $key = lc $key;