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 2021/05/10 18:20:22 UTC
svn commit: r1889731 - in /spamassassin: branches/3.4/
branches/3.4/lib/Mail/SpamAssassin/
branches/3.4/lib/Mail/SpamAssassin/Conf/ branches/3.4/t/ trunk/
trunk/lib/Mail/SpamAssassin/ trunk/lib/Mail/SpamAssassin/Conf/ trunk/t/
Author: hege
Date: Mon May 10 18:20:22 2021
New Revision: 1889731
URL: http://svn.apache.org/viewvc?rev=1889731&view=rev
Log:
Disable duplicate rule merging per https://bz.apache.org/SpamAssassin/show_bug.cgi?id=7735#c12
Removed:
spamassassin/branches/3.4/t/duplicates.t
spamassassin/trunk/t/duplicates.t
Modified:
spamassassin/branches/3.4/MANIFEST
spamassassin/branches/3.4/lib/Mail/SpamAssassin/Conf/Parser.pm
spamassassin/branches/3.4/lib/Mail/SpamAssassin/PerMsgStatus.pm
spamassassin/trunk/MANIFEST
spamassassin/trunk/lib/Mail/SpamAssassin/Conf/Parser.pm
spamassassin/trunk/lib/Mail/SpamAssassin/PerMsgStatus.pm
Modified: spamassassin/branches/3.4/MANIFEST
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/MANIFEST?rev=1889731&r1=1889730&r2=1889731&view=diff
==============================================================================
--- spamassassin/branches/3.4/MANIFEST (original)
+++ spamassassin/branches/3.4/MANIFEST Mon May 10 18:20:22 2021
@@ -441,7 +441,6 @@ t/desc_wrap.t
t/dkim.t
t/dnsbl.t
t/dnsbl_sc_meta.t
-t/duplicates.t
t/freemail.t
t/get_all_headers.t
t/get_headers.t
Modified: spamassassin/branches/3.4/lib/Mail/SpamAssassin/Conf/Parser.pm
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/lib/Mail/SpamAssassin/Conf/Parser.pm?rev=1889731&r1=1889730&r2=1889731&view=diff
==============================================================================
--- spamassassin/branches/3.4/lib/Mail/SpamAssassin/Conf/Parser.pm (original)
+++ spamassassin/branches/3.4/lib/Mail/SpamAssassin/Conf/Parser.pm Mon May 10 18:20:22 2021
@@ -880,7 +880,8 @@ sub finish_parsing {
# don't do this if allow_user_rules is active, since it deletes entries
# from {tests}
if (!$conf->{allow_user_rules}) {
- $self->find_dup_rules(); # must be after fix_priorities()
+ # Duplicate merging is buggy, disabled, code to be removed
+ #$self->find_dup_rules(); # must be after fix_priorities()
}
dbg("config: finish parsing");
Modified: spamassassin/branches/3.4/lib/Mail/SpamAssassin/PerMsgStatus.pm
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/lib/Mail/SpamAssassin/PerMsgStatus.pm?rev=1889731&r1=1889730&r2=1889731&view=diff
==============================================================================
--- spamassassin/branches/3.4/lib/Mail/SpamAssassin/PerMsgStatus.pm (original)
+++ spamassassin/branches/3.4/lib/Mail/SpamAssassin/PerMsgStatus.pm Mon May 10 18:20:22 2021
@@ -2892,12 +2892,13 @@ sub got_hit {
$rule_descr);
# take care of duplicate rules, too (bug 5206)
- my $dups = $conf_ref->{duplicate_rules}->{$rule};
- if ($dups && @{$dups}) {
- foreach my $dup (@{$dups}) {
- $self->got_hit($dup, $area, %params);
- }
- }
+ # ... removed as it's buggy
+ #my $dups = $conf_ref->{duplicate_rules}->{$rule};
+ #if ($dups && @{$dups}) {
+ # foreach my $dup (@{$dups}) {
+ # $self->got_hit($dup, $area, %params);
+ # }
+ #}
%{$self->{test_log_msgs}} = (); # clear test logs
return 1;
Modified: spamassassin/trunk/MANIFEST
URL: http://svn.apache.org/viewvc/spamassassin/trunk/MANIFEST?rev=1889731&r1=1889730&r2=1889731&view=diff
==============================================================================
--- spamassassin/trunk/MANIFEST (original)
+++ spamassassin/trunk/MANIFEST Mon May 10 18:20:22 2021
@@ -478,7 +478,6 @@ t/dkim.t
t/dnsbl.t
t/dnsbl_sc_meta.t
t/dnsbl_subtests.t
-t/duplicates.t
t/esp.t
t/extracttext.t
t/freemail.t
Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Conf/Parser.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Conf/Parser.pm?rev=1889731&r1=1889730&r2=1889731&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Conf/Parser.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Conf/Parser.pm Mon May 10 18:20:22 2021
@@ -892,7 +892,8 @@ sub finish_parsing {
# don't do this if allow_user_rules is active, since it deletes entries
# from {tests}
if (!$conf->{allow_user_rules}) {
- $self->find_dup_rules(); # must be after fix_priorities()
+ # Duplicate merging is buggy, disabled, code to be removed
+ #$self->find_dup_rules(); # must be after fix_priorities()
}
dbg("config: finish parsing");
Modified: spamassassin/trunk/lib/Mail/SpamAssassin/PerMsgStatus.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/PerMsgStatus.pm?rev=1889731&r1=1889730&r2=1889731&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/PerMsgStatus.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/PerMsgStatus.pm Mon May 10 18:20:22 2021
@@ -3135,12 +3135,13 @@ sub got_hit {
$rule_descr);
# take care of duplicate rules, too (bug 5206)
- my $dups = $conf_ref->{duplicate_rules}->{$rule};
- if ($dups && @{$dups}) {
- foreach my $dup (@{$dups}) {
- $self->got_hit($dup, $area, %params);
- }
- }
+ # ... removed as it's buggy
+ #my $dups = $conf_ref->{duplicate_rules}->{$rule};
+ #if ($dups && @{$dups}) {
+ # foreach my $dup (@{$dups}) {
+ # $self->got_hit($dup, $area, %params);
+ # }
+ #}
return 1;
}