You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by si...@apache.org on 2010/04/04 10:08:13 UTC
svn commit: r930641 -
/spamassassin/trunk/lib/Mail/SpamAssassin/PerMsgStatus.pm
Author: sidney
Date: Sun Apr 4 08:08:13 2010
New Revision: 930641
URL: http://svn.apache.org/viewvc?rev=930641&view=rev
Log:
bug 6395: fix plain text uri parsing to recognize uri at end of decoded body with no final newline
Modified:
spamassassin/trunk/lib/Mail/SpamAssassin/PerMsgStatus.pm
Modified: spamassassin/trunk/lib/Mail/SpamAssassin/PerMsgStatus.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/PerMsgStatus.pm?rev=930641&r1=930640&r2=930641&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/PerMsgStatus.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/PerMsgStatus.pm Sun Apr 4 08:08:13 2010
@@ -1750,9 +1750,9 @@ my $urischemeless = qr/[a-z\d][a-z\d._-]
my $uriknownscheme = qr/(?:(?:(?:(?:https?)|(?:ftp)):(?:\/\/)?)|(?:(?:www\d{0,2}|ftp)\.))[^$tbirdenddelim]{1,251}/io;
my $urimailscheme = qr/(?:mailto:)?[^$tbirdenddelimplusat]{1,251}@[^$tbirdenddelimemail]{1,251}/io;
my $tbirdurire = qr/(?:\b|(?<=$iso2022shift)|(?<=[$tbirdstartdelim]))
- (?:(?:($uriknownscheme)(?=[$tbirdenddelim])) |
- (?:($urimailscheme)(?=[$tbirdenddelimemail])) |
- (?:\b($urischemeless)(?=[$tbirdenddelim])))/xo;
+ (?:(?:($uriknownscheme)(?=(?:[$tbirdenddelim]|\z))) |
+ (?:($urimailscheme)(?=(?:[$tbirdenddelimemail]|\z))) |
+ (?:\b($urischemeless)(?=(?:[$tbirdenddelim]|\z))))/xo;
=item $status->get_uri_list ()