You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by do...@apache.org on 2005/07/21 07:56:07 UTC
svn commit: r220000 - in /spamassassin/trunk/lib/Mail/SpamAssassin:
Conf/Parser.pm Plugin/WhiteListSubject.pm
Author: dos
Date: Wed Jul 20 22:56:06 2005
New Revision: 220000
URL: http://svn.apache.org/viewcvs?rev=220000&view=rev
Log:
bug 4414: remove redundant wildcards from white/blacklist regexps
Modified:
spamassassin/trunk/lib/Mail/SpamAssassin/Conf/Parser.pm
spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/WhiteListSubject.pm
Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Conf/Parser.pm
URL: http://svn.apache.org/viewcvs/spamassassin/trunk/lib/Mail/SpamAssassin/Conf/Parser.pm?rev=220000&r1=219999&r2=220000&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Conf/Parser.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Conf/Parser.pm Wed Jul 20 22:56:06 2005
@@ -920,7 +920,7 @@
$re =~ s/[\000\\\(]/_/gs; # paranoia
$re =~ s/([^\*\?_a-zA-Z0-9])/\\$1/g; # escape any possible metachars
$re =~ tr/?/./; # "?" -> "."
- $re =~ s/\*/\.\*/g; # "*" -> "any string"
+ $re =~ s/\*+/\.\*/g; # "*" -> "any string"
$conf->{$singlelist}->{$addr} = "^${re}\$";
}
}
@@ -938,7 +938,7 @@
$re =~ s/[\000\\\(]/_/gs; # paranoia
$re =~ s/([^\*\?_a-zA-Z0-9])/\\$1/g; # escape any possible metachars
$re =~ tr/?/./; # "?" -> "."
- $re =~ s/\*/\.\*/g; # "*" -> "any string"
+ $re =~ s/\*+/\.\*/g; # "*" -> "any string"
$conf->{$listname}->{$addr}{re} = "^${re}\$";
$conf->{$listname}->{$addr}{domain} = [ $domain ];
}
Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/WhiteListSubject.pm
URL: http://svn.apache.org/viewcvs/spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/WhiteListSubject.pm?rev=220000&r1=219999&r2=220000&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/WhiteListSubject.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/WhiteListSubject.pm Wed Jul 20 22:56:06 2005
@@ -82,7 +82,7 @@
$re =~ s/[\000\\\(]/_/gs; # paranoia
$re =~ s/([^\*\?_a-zA-Z0-9])/\\$1/g; # escape any possible metachars
$re =~ tr/?/./; # "?" -> "."
- $re =~ s/\*/\.\*/g; # "*" -> "any string"
+ $re =~ s/\*+/\.\*/g; # "*" -> "any string"
$conf->{$key}->{$value} = ${re};
}});
@@ -96,7 +96,7 @@
$re =~ s/[\000\\\(]/_/gs; # paranoia
$re =~ s/([^\*\?_a-zA-Z0-9])/\\$1/g; # escape any possible metachars
$re =~ tr/?/./; # "?" -> "."
- $re =~ s/\*/\.\*/g; # "*" -> "any string"
+ $re =~ s/\*+/\.\*/g; # "*" -> "any string"
$conf->{$key}->{$value} = ${re};
}});