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/04/14 01:39:29 UTC
svn commit: r1673314 - /spamassassin/trunk/lib/Mail/SpamAssassin/Conf.pm
Author: mmartinec
Date: Mon Apr 13 23:39:29 2015
New Revision: 1673314
URL: http://svn.apache.org/r1673314
Log:
Bug 7144c9: make it possible to also turn off normalize_charset
Modified:
spamassassin/trunk/lib/Mail/SpamAssassin/Conf.pm
Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Conf.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Conf.pm?rev=1673314&r1=1673313&r2=1673314&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Conf.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Conf.pm Mon Apr 13 23:39:29 2015
@@ -1139,29 +1139,29 @@ it will be used if it is available.
unless (defined $value && $value !~ /^$/) {
return $MISSING_REQUIRED_VALUE;
}
- return if $value == 0;
- return $INVALID_VALUE unless $value == 1;
+ if (lc $value eq 'yes' || $value eq '1') { $value = 1 }
+ elsif (lc $value eq 'no' || $value eq '0') { $value = 0 }
+ else { return $INVALID_VALUE }
+
+ $self->{normalize_charset} = $value;
unless ($] > 5.008004) {
$self->{parser}->lint_warn("config: normalize_charset requires Perl 5.8.5 or later");
+ $self->{normalize_charset} = 0;
return $INVALID_VALUE;
}
require HTML::Parser;
#changed to eval to use VERSION so that this version was not incorrectly parsed for CPAN
unless ( eval { HTML::Parser->VERSION(3.46) } ) {
$self->{parser}->lint_warn("config: normalize_charset requires HTML::Parser 3.46 or later");
+ $self->{normalize_charset} = 0;
return $INVALID_VALUE;
}
-# unless (eval 'require Encode::Detect::Detector') {
-# $self->{parser}->lint_warn("config: normalize_charset requires Encode::Detect::Detector");
-# return $INVALID_VALUE;
-# }
unless (eval 'require Encode') {
$self->{parser}->lint_warn("config: normalize_charset requires Encode");
+ $self->{normalize_charset} = 0;
return $INVALID_VALUE;
}
-
- $self->{normalize_charset} = 1;
}
});