You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by do...@apache.org on 2005/05/03 04:51:19 UTC

svn commit: r167848 - /spamassassin/trunk/lib/Mail/SpamAssassin/EvalTests.pm

Author: dos
Date: Mon May  2 19:51:18 2005
New Revision: 167848

URL: http://svn.apache.org/viewcvs?rev=167848&view=rev
Log:
bug 4207: mime_multipart_ratio should check size of last plain & html parts

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=167848&r1=167847&r2=167848&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/EvalTests.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/EvalTests.pm Mon May  2 19:51:18 2005
@@ -2456,14 +2456,16 @@
   if ($self->{mime_multipart_alternative}) {
     my $text;
     my $html;
-    for (my $i = 0; $i <= $part; $i++) {
+    # bug 4207: we want the size of the last parts
+    for (my $i = $part; $i >= 0; $i--) {
       next if !defined $part_bytes[$i];
       if (!defined($html) && $part_type[$i] eq 'text/html') {
 	$html = $part_bytes[$i];
       }
-      if (!defined($text) && $part_type[$i] eq 'text/plain') {
+      elsif (!defined($text) && $part_type[$i] eq 'text/plain') {
 	$text = $part_bytes[$i];
       }
+      last if (defined($html) && defined($text));
     }
     if (defined($text) && defined($html) && $html > 0) {
       $self->{mime_multipart_ratio} = ($text / $html);