You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by si...@apache.org on 2006/04/09 14:43:32 UTC
svn commit: r392708 - /spamassassin/trunk/lib/Mail/SpamAssassin/EvalTests.pm
Author: sidney
Date: Sun Apr 9 05:43:31 2006
New Revision: 392708
URL: http://svn.apache.org/viewcvs?rev=392708&view=rev
Log:
bug 4829: cleaner fix than was committed in 390993
Modified:
spamassassin/trunk/lib/Mail/SpamAssassin/EvalTests.pm
Modified: spamassassin/trunk/lib/Mail/SpamAssassin/EvalTests.pm
URL: http://svn.apache.org/viewcvs/spamassassin/trunk/lib/Mail/SpamAssassin/EvalTests.pm?rev=392708&r1=392707&r2=392708&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/EvalTests.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/EvalTests.pm Sun Apr 9 05:43:31 2006
@@ -2990,22 +2990,18 @@
sub check_https_ip_mismatch {
my ($self) = @_;
- my $flag = 0;
-
while (my($k,$v) = each %{$self->{html}->{uri_detail}}) {
- last if $flag;
next if ($k !~ m%^https?:/*(?:[^\@/]+\@)?\d+\.\d+\.\d+\.\d+%i);
foreach (@{$v->{anchor_text}}) {
next if (m%^https:/*(?:[^\@/]+\@)?\d+\.\d+\.\d+\.\d+%i);
if (m%https:%i) {
- $flag = 1;
- last;
+ keys %{$self->{html}->{uri_detail}}; # resets iterator, bug 4829
+ return 1;
}
}
}
- keys %{$self->{html}->{uri_detail}}; # resets iterator, bug 4829
- return $flag;
+ return 0;
}
sub check_ratware_envelope_from {