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 2019/06/25 12:51:45 UTC
svn commit: r1862057 - in /spamassassin:
branches/3.4/lib/Mail/SpamAssassin/Plugin/ImageInfo.pm
trunk/lib/Mail/SpamAssassin/Plugin/ImageInfo.pm
Author: hege
Date: Tue Jun 25 12:51:45 2019
New Revision: 1862057
URL: http://svn.apache.org/viewvc?rev=1862057&view=rev
Log:
Also parse image/jpg (commonly used even if not standard)
Modified:
spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/ImageInfo.pm
spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/ImageInfo.pm
Modified: spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/ImageInfo.pm
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/ImageInfo.pm?rev=1862057&r1=1862056&r2=1862057&view=diff
==============================================================================
--- spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/ImageInfo.pm (original)
+++ spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/ImageInfo.pm Tue Jun 25 12:51:45 2019
@@ -225,12 +225,13 @@ sub _get_images {
$pms->{'imageinfo'}->{"count_$type"} = 0;
}
- foreach my $p ($pms->{msg}->find_parts(qr@^image/(?:gif|png|jpeg)$@, 1)) {
+ foreach my $p ($pms->{msg}->find_parts(qr@^image/(?:gif|png|jpe?g)$@, 1)) {
# make sure its base64 encoded
my $cte = lc($p->get_header('content-transfer-encoding') || '');
next if ($cte !~ /^base64$/);
my ($type) = $p->{'type'} =~ m@/(\w+)$@;
+ $type = 'jpeg' if $type eq 'jpg';
if ($type && exists $get_details{$type}) {
$get_details{$type}->($pms,$p);
$pms->{'imageinfo'}->{"count_$type"} ++;
Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/ImageInfo.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/ImageInfo.pm?rev=1862057&r1=1862056&r2=1862057&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/ImageInfo.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/ImageInfo.pm Tue Jun 25 12:51:45 2019
@@ -225,12 +225,13 @@ sub _get_images {
$pms->{'imageinfo'}->{"count_$type"} = 0;
}
- foreach my $p ($pms->{msg}->find_parts(qr@^image/(?:gif|png|jpeg)$@, 1)) {
+ foreach my $p ($pms->{msg}->find_parts(qr@^image/(?:gif|png|jpe?g)$@, 1)) {
# make sure its base64 encoded
my $cte = lc($p->get_header('content-transfer-encoding') || '');
next if ($cte !~ /^base64$/);
my ($type) = $p->{'type'} =~ m@/(\w+)$@;
+ $type = 'jpeg' if $type eq 'jpg';
if ($type && exists $get_details{$type}) {
$get_details{$type}->($pms,$p);
$pms->{'imageinfo'}->{"count_$type"} ++;