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 2019/08/13 13:51:11 UTC
svn commit: r1865042 - /spamassassin/trunk/lib/Mail/SpamAssassin/Util.pm
Author: hege
Date: Tue Aug 13 13:51:11 2019
New Revision: 1865042
URL: http://svn.apache.org/viewvc?rev=1865042&view=rev
Log:
Tweak uri email canonicalizer a bit
Modified:
spamassassin/trunk/lib/Mail/SpamAssassin/Util.pm
Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Util.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Util.pm?rev=1865042&r1=1865041&r2=1865042&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Util.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Util.pm Tue Aug 13 13:51:11 2019
@@ -1496,10 +1496,10 @@ sub uri_list_canonicalize {
if ($uri =~ /^mailto:/i || $uri =~ /^[^:]*\@/) {
# Strip ?subject= parameters and obfuscations
# Outlook linkifies foo@bar%2Ecom&x.com to foo@bar.com !!
- if ($nuri =~ /^(.*?)\?/) {
+ if ($nuri =~ /^([^@]+\@[^?]+)\?/) {
push @nuris, $1;
}
- if ($nuri =~ /^(.*?)\&/) {
+ if ($nuri =~ /^([^@]+\@[^&]+)\&/) {
push @nuris, $1
}
# End email processing