Attachment #4875 for bug #6558

View | Details | Raw Unified | Return to bug 6558
Collapse All | Expand All

Lines 200-207 Link Here

(-)lib/Mail/SpamAssassin/Plugin/BodyRuleBaseExtractor.pm (-2 / +3 lines)
200	}	200	}
201		201
202	if ($is_a_replacetags_rule \|\| !$minlen \|\| !@bases) {	202	if ($is_a_replacetags_rule \|\| !$minlen \|\| !@bases) {
203	dbg("zoom: ignoring %s %s",	203	dbg("zoom: ignoring rule %s, %s", $name,
204	$is_a_replacetags_rule ? 'replace rule' : 'NO', $rule);	204	$is_a_replacetags_rule ? 'is a replace rule'
		205	: !@bases ? 'no bases' : 'no minlen');
205	push @failed, { orig => $rule };	206	push @failed, { orig => $rule };
206	$cached->{rule_bases}->{$cachekey} = { };	207	$cached->{rule_bases}->{$cachekey} = { };
207	$no++;	208	$no++;





    if (($conf->{tflags}->{$rulename}||'') =~ /\bmultiple\b/)
    {
      # avoid [perl #86784] bug (fixed in 5.13.x), access the arg through ref
      $sub = '
      my $lref = \$_[1];
      pos $$lref = 0;
      '.$self->hash_line_for_rule($pms, $rulename).'
      while ($$lref =~ '.$pat.'g) {
        my $self = $_[0];
        $self->got_hit(q{'.$rulename.'}, "BODY: ", ruletype => "one_line_body");
        '. $self->hit_rule_plugin_code($pms, $rulename, "one_line_body",

Lines 3997-4002 Link Here

(-)lib/Mail/SpamAssassin/Conf.pm (+1 lines)
3997	# if (can(Mail::SpamAssassin::Conf::feature_originating_ip_headers))	3997	# if (can(Mail::SpamAssassin::Conf::feature_originating_ip_headers))
3998		3998
3999	sub feature_originating_ip_headers { 1 }	3999	sub feature_originating_ip_headers { 1 }
		4000	sub feature_bug6558_free { 1 }
4000		4001
4001	###########################################################################	4002	###########################################################################
4002		4003

Return to bug 6558

Lines 94-103 Link Here

(-)lib/Mail/SpamAssassin/Plugin/OneLineBodyRuleType.pm (-2 / +4 lines)
94		94
95	if (($conf->{tflags}->{$rulename}\|\|'') =~ /\bmultiple\b/)	95	if (($conf->{tflags}->{$rulename}\|\|'') =~ /\bmultiple\b/)
96	{	96	{
		97	# avoid [perl #86784] bug (fixed in 5.13.x), access the arg through ref
97	$sub = '	98	$sub = '
98	pos $_[1] = 0;	99	my $lref = \$_[1];
		100	pos $$lref = 0;
99	'.$self->hash_line_for_rule($pms, $rulename).'	101	'.$self->hash_line_for_rule($pms, $rulename).'
100	while ($_[1] =~ '.$pat.'g) {	102	while ($$lref =~ '.$pat.'g) {
101	my $self = $_[0];	103	my $self = $_[0];
102	$self->got_hit(q{'.$rulename.'}, "BODY: ", ruletype => "one_line_body");	104	$self->got_hit(q{'.$rulename.'}, "BODY: ", ruletype => "one_line_body");
103	'. $self->hit_rule_plugin_code($pms, $rulename, "one_line_body",	105	'. $self->hit_rule_plugin_code($pms, $rulename, "one_line_body",