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 2018/10/28 13:47:16 UTC
svn commit: r1845030 -
/spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/MIMEEval.pm
Author: hege
Date: Sun Oct 28 13:47:15 2018
New Revision: 1845030
URL: http://svn.apache.org/viewvc?rev=1845030&view=rev
Log:
Use index for literal matches
Modified:
spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/MIMEEval.pm
Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/MIMEEval.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/MIMEEval.pm?rev=1845030&r1=1845029&r2=1845030&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/MIMEEval.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/MIMEEval.pm Sun Oct 28 13:47:15 2018
@@ -359,7 +359,7 @@ sub _check_attachments {
$part++;
$part_type[$part] = $ctype;
- $part_bytes[$part] = 0 if $cd !~ /attachment/;
+ $part_bytes[$part] = 0 if index($cd, 'attachment') == -1;
my $cte_is_base64 = $cte =~ /base64/i;
my $previous = '';
@@ -378,7 +378,7 @@ sub _check_attachments {
# if ($pms->{mime_html_no_charset} && $ctype eq 'text/html' && defined $charset) {
# $pms->{mime_html_no_charset} = 0;
# }
- if ($pms->{mime_multipart_alternative} && $cd !~ /attachment/ &&
+ if ($pms->{mime_multipart_alternative} && index($cd, 'attachment') == -1 &&
($ctype eq 'text/plain' || $ctype eq 'text/html')) {
$part_bytes[$part] += length;
}