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 2019/06/15 11:59:42 UTC
svn commit: r1861376 -
/spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/Check.pm
Author: hege
Date: Sat Jun 15 11:59:42 2019
New Revision: 1861376
URL: http://svn.apache.org/viewvc?rev=1861376&view=rev
Log:
Fix expand_ruleglob
Modified:
spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/Check.pm
Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/Check.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/Check.pm?rev=1861376&r1=1861375&r2=1861376&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/Check.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/Check.pm Sat Jun 15 11:59:42 2019
@@ -528,7 +528,7 @@ sub add_temporary_method {
# Returns all rulenames matching glob (FOO_*)
sub expand_ruleglob {
- my ($self, $ruleglob, $pms, $conf) = @_;
+ my ($self, $ruleglob, $pms, $conf, $rulename) = @_;
my $expanded;
if (exists $pms->{ruleglob_cache}{$ruleglob}) {
$expanded = $pms->{ruleglob_cache}{$ruleglob};
@@ -564,7 +564,7 @@ sub do_meta_tests {
my ($self, $pms, $conf, $rulename, $rule, %opts) = @_;
# Expand meta rules_matching() before lexing
- $rule =~ s/${META_RULES_MATCHING_RE}/$self->expand_ruleglob($1,$pms,$conf)/ge;
+ $rule =~ s/${META_RULES_MATCHING_RE}/$self->expand_ruleglob($1,$pms,$conf,$rulename)/ge;
# Lex the rule into tokens using a rather simple RE method ...
my @tokens = ($rule =~ /$ARITH_EXPRESSION_LEXER/og);