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/02 04:56:57 UTC
svn commit: r1842593 - in /spamassassin:
branches/3.4/lib/Mail/SpamAssassin/Conf/Parser.pm
trunk/lib/Mail/SpamAssassin/Conf/Parser.pm
Author: hege
Date: Tue Oct 2 04:56:57 2018
New Revision: 1842593
URL: http://svn.apache.org/viewvc?rev=1842593&view=rev
Log:
Allow decimal number in meta token (Bug 7557)
Modified:
spamassassin/branches/3.4/lib/Mail/SpamAssassin/Conf/Parser.pm
spamassassin/trunk/lib/Mail/SpamAssassin/Conf/Parser.pm
Modified: spamassassin/branches/3.4/lib/Mail/SpamAssassin/Conf/Parser.pm
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/lib/Mail/SpamAssassin/Conf/Parser.pm?rev=1842593&r1=1842592&r2=1842593&view=diff
==============================================================================
--- spamassassin/branches/3.4/lib/Mail/SpamAssassin/Conf/Parser.pm (original)
+++ spamassassin/branches/3.4/lib/Mail/SpamAssassin/Conf/Parser.pm Tue Oct 2 04:56:57 2018
@@ -1312,8 +1312,9 @@ sub is_meta_valid {
if ($token =~ /^[_[:alpha:]]\w+\z/s) {
$meta .= "0 ";
}
- # if it is a number or a string of 1 or 2 punctuation characters (i.e. operators) tack it onto the degenerate rule
- elsif ( $token =~ /^(\d+|[[:punct:]]{1,2})\z/s ) {
+ # if it is a (decial) number or a string of 1 or 2 punctuation
+ # characters (i.e. operators) tack it onto the degenerate rule
+ elsif ( $token =~ /^(\d+(?:\.\d+)?|[[:punct:]]{1,2})\z/s ) {
$meta .= "$token ";
}
# WTF is it? Just warn, for now. Bug #7557
Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Conf/Parser.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Conf/Parser.pm?rev=1842593&r1=1842592&r2=1842593&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Conf/Parser.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Conf/Parser.pm Tue Oct 2 04:56:57 2018
@@ -1312,8 +1312,9 @@ sub is_meta_valid {
if ($token =~ /^[_[:alpha:]]\w+\z/s) {
$meta .= "0 ";
}
- # if it is a number or a string of 1 or 2 punctuation characters (i.e. operators) tack it onto the degenerate rule
- elsif ( $token =~ /^(\d+|[[:punct:]]{1,2})\z/s ) {
+ # if it is a (decimal) number or a string of 1 or 2 punctuation
+ # characters (i.e. operators) tack it onto the degenerate rule
+ elsif ( $token =~ /^(\d+(?:\.\d+)?|[[:punct:]]{1,2})\z/s ) {
$meta .= "$token ";
}
# WTF is it? Just warn, for now. Bug #7557