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 2013/08/16 00:52:12 UTC
svn commit: r1514524 -
/spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/FreeMail.pm
Author: mmartinec
Date: Thu Aug 15 22:52:12 2013
New Revision: 1514524
URL: http://svn.apache.org/r1514524
Log:
Bug 6968: quote a $ within a character class (Bleadperl v5.19.2-257-gc30fc27 fixes a bug in perl which Mail/SpamAssassin/Plugin/FreeMail.pm relies)
Modified:
spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/FreeMail.pm
Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/FreeMail.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/FreeMail.pm?rev=1514524&r1=1514523&r2=1514524&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/FreeMail.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/FreeMail.pm Thu Aug 15 22:52:12 2013
@@ -121,10 +121,10 @@ my $tlds = $Mail::SpamAssassin::Util::Re
# full email regex
my $email_regex = qr/
(?=.{0,64}\@) # limit userpart to 64 chars (and speed up searching?)
- (?<![a-z0-9!#$%&'*+\/=?^_`{|}~-]) # start boundary
+ (?<![a-z0-9!#\$%&'*+\/=?^_`{|}~-]) # start boundary
( # capture email
- [a-z0-9!#$%&'*+\/=?^_`{|}~-]+ # no dot in beginning
- (?:\.[a-z0-9!#$%&'*+\/=?^_`{|}~-]+)* # no consecutive dots, no ending dot
+ [a-z0-9!#\$%&'*+\/=?^_`{|}~-]+ # no dot in beginning
+ (?:\.[a-z0-9!#\$%&'*+\/=?^_`{|}~-]+)* # no consecutive dots, no ending dot
\@
(?:[a-z0-9](?:[a-z0-9-]{0,59}[a-z0-9])?\.){1,4} # max 4x61 char parts (should be enough?)
${tlds} # ends with valid tld