
felicity at apache
Jan 8, 2004, 4:56 PM
Views: 235
Permalink
|
|
svn commit: rev 6126 - incubator/spamassassin/trunk/lib/Mail/SpamAssassin
|
|
Author: felicity Date: Thu Jan 8 15:56:37 2004 New Revision: 6126 Modified: incubator/spamassassin/trunk/lib/Mail/SpamAssassin/EvalTests.pm Log: bug 2608: HABEAS_SWE wasn't trigerring if the X-Habeas-SWE headers are out of order in the message header (some MUAs do this). Modified: incubator/spamassassin/trunk/lib/Mail/SpamAssassin/EvalTests.pm ============================================================================== --- incubator/spamassassin/trunk/lib/Mail/SpamAssassin/EvalTests.pm (original) +++ incubator/spamassassin/trunk/lib/Mail/SpamAssassin/EvalTests.pm Thu Jan 8 15:56:37 2004 @@ -2090,16 +2090,17 @@ $self->{habeas_swe} = 0; - my $all = $self->get('ALL'); - if ($all =~ /\n(X-Habeas-SWE-1:.{0,512}X-Habeas-SWE-9:[^\n]{0,64}\n)/si) { - my $text = $1; - $text =~ tr/A-Z/a-z/; - $text =~ tr/ / /s; - $text =~ s/\/?>/\/>/; - if (sha1($text) eq "42ab3d716380503f66c4d44017c7f37b04458a9a") { - $self->{habeas_swe} = 1; - } + my $text = ''; + for (my $i = 1; $i <= 9; $i++) { + $text .= lc($self->get("X-Habeas-SWE-$i")); } + if ($text) { + $text =~ s,\s+, ,g; + $text =~ s,^\s|\s$,,g; + $text =~ s,/?>,/>,; + $self->{habeas_swe} = sha1($text) eq q(76c65d9eb65e572166a08b50fd197b29af09d43a); + } + return $self->{habeas_swe}; }
|