You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by mm...@apache.org on 2015/10/08 18:41:02 UTC
svn commit: r1707582 - in /spamassassin/trunk/lib/Mail/SpamAssassin: Conf.pm
Message.pm PerMsgStatus.pm Plugin/FreeMail.pm Util.pm
Author: mmartinec
Date: Thu Oct 8 16:41:01 2015
New Revision: 1707582
URL: http://svn.apache.org/viewvc?rev=1707582&view=rev
Log:
random changes, cosmetic or trivial
Modified:
spamassassin/trunk/lib/Mail/SpamAssassin/Conf.pm
spamassassin/trunk/lib/Mail/SpamAssassin/Message.pm
spamassassin/trunk/lib/Mail/SpamAssassin/PerMsgStatus.pm
spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/FreeMail.pm
spamassassin/trunk/lib/Mail/SpamAssassin/Util.pm
Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Conf.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Conf.pm?rev=1707582&r1=1707581&r2=1707582&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Conf.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Conf.pm Thu Oct 8 16:41:01 2015
@@ -4625,12 +4625,12 @@ sub mtime {
sub parse_scores_only {
my ($self) = @_;
- $_[0]->{parser}->parse ($_[1], 1);
+ $self->{parser}->parse ($_[1], 1);
}
sub parse_rules {
my ($self) = @_;
- $_[0]->{parser}->parse ($_[1], 0);
+ $self->{parser}->parse ($_[1], 0);
}
###########################################################################
Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Message.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Message.pm?rev=1707582&r1=1707581&r2=1707582&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Message.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Message.pm Thu Oct 8 16:41:01 2015
@@ -1040,7 +1040,7 @@ sub _parse_normal {
# attempt to figure out a name for this attachment if there is one ...
my $disp = $msg->header('content-disposition') || '';
- if ($disp =~ /name="?([^\";]+)"?/i) {
+ if ($disp =~ /name=\s*"?([^";]+)"?/i) {
$msg->{'name'} = $1;
}
elsif ($ct[3]) {
Modified: spamassassin/trunk/lib/Mail/SpamAssassin/PerMsgStatus.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/PerMsgStatus.pm?rev=1707582&r1=1707581&r2=1707582&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/PerMsgStatus.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/PerMsgStatus.pm Thu Oct 8 16:41:01 2015
@@ -1269,8 +1269,8 @@ sub rewrite_no_report_safe {
sub qp_encode_header {
my ($self, $text) = @_;
- # do nothing unless there's an 8-bit char
- return $text unless ($text =~ /[\x80-\xff]/);
+ # return unchanged if there are no 8-bit characters
+ return $text if $text !~ tr/\x00-\x7F//c;
my $cs = 'ISO-8859-1';
if ($self->{report_charset}) {
@@ -1965,7 +1965,8 @@ sub _get {
else {
my @results = $getraw ? $self->{msg}->raw_header($request)
: $self->{msg}->get_header($request);
- # dbg("message: get(%s) = %s", $request, join(", ",@results));
+ # dbg("message: get(%s)%s = %s",
+ # $request, $getraw?'raw':'', join(", ",@results));
if (@results) {
$result = join('', @results);
} else { # metadata
Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/FreeMail.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/FreeMail.pm?rev=1707582&r1=1707581&r2=1707582&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/FreeMail.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/FreeMail.pm Thu Oct 8 16:41:01 2015
@@ -342,15 +342,15 @@ sub _parse_body {
my $body = $pms->get_decoded_stripped_body_text_array();
BODY: foreach (@$body) {
# strip urls with possible emails inside
- s#<?https?://\S{0,255}(?:\@|%40)\S{0,255}# #gi;
+ s{<?https?://\S{0,255}(?:\@|%40)\S{0,255}}{ }gi;
# strip emails contained in <>, not mailto:
# also strip ones followed by quote-like "wrote:" (but not fax: and tel: etc)
- s#<?(?<!mailto:)$self->{email_regex}(?:>|\s{1,10}(?!(?:fa(?:x|csi)|tel|phone|e?-?mail))[a-z]{2,11}:)# #gi;
+ s{<?(?<!mailto:)$self->{email_regex}(?:>|\s{1,10}(?!(?:fa(?:x|csi)|tel|phone|e?-?mail))[a-z]{2,11}:)}{ }gi;
while (/$self->{email_regex}/g) {
my $email = lc($1);
push(@body_emails, $email) unless defined $seen{$email};
$seen{$email} = 1;
- last BODY if scalar @body_emails >= 40; # sanity
+ last BODY if @body_emails >= 40; # sanity
}
}
my $count_all = 0;
Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Util.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Util.pm?rev=1707582&r1=1707581&r2=1707582&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Util.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Util.pm Thu Oct 8 16:41:01 2015
@@ -821,6 +821,7 @@ sub base64_decode {
m|^(?:[A-Za-z0-9+/=]{2,}={0,2})$|s)
{
# only use MIME::Base64 when the XS and Perl are both correct and quiet
+ local $1;
s/(=+)(?!=*$)/'A' x length($1)/ge;
# If only a certain number of bytes are requested, truncate the encoded
@@ -836,7 +837,7 @@ sub base64_decode {
}
tr{A-Za-z0-9+/=}{}cd; # remove non-base64 characters
s/=+$//; # remove terminating padding
- tr{A-Za-z0-9+/=}{ -_`}; # translate to uuencode
+ tr{A-Za-z0-9+/=}{ -_}; # translate to uuencode
s/.$// if (length($_) % 4 == 1); # unpack cannot cope with extra byte
my $length;
@@ -857,19 +858,21 @@ sub base64_decode {
}
sub qp_decode {
- local $_ = shift;
+ my $str = $_[0];
# RFC 2045: when decoding a Quoted-Printable body, any trailing
# white space on a line must be deleted
- s/[ \t]+(?=\r?\n)//gs;
+ $str =~ s/[ \t]+(?=\r?\n)//gs;
- s/=\r?\n//gs; # soft line breaks
+ $str =~ s/=\r?\n//gs; # soft line breaks
# RFC 2045 explicitly prohibits lowercase characters a-f in QP encoding
# do we really want to allow them???
- s/=([0-9a-fA-F]{2})/chr(hex($1))/ge;
- return $_;
+ local $1;
+ $str =~ s/=([0-9a-fA-F]{2})/chr(hex($1))/ge;
+
+ return $str;
}
sub base64_encode {