Return-Path: Delivered-To: apmail-incubator-spamassassin-cvs-archive@www.apache.org Received: (qmail 70112 invoked from network); 15 May 2004 01:38:43 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur-2.apache.org with SMTP; 15 May 2004 01:38:43 -0000 Received: (qmail 46243 invoked by uid 500); 15 May 2004 01:39:10 -0000 Delivered-To: apmail-incubator-spamassassin-cvs-archive@incubator.apache.org Received: (qmail 46228 invoked by uid 500); 15 May 2004 01:39:09 -0000 Mailing-List: contact spamassassin-cvs-help@incubator.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: list-post: Reply-To: "Spam Assassin Dev" List-Id: "SpamAssassin Commits" Delivered-To: mailing list spamassassin-cvs@incubator.apache.org Received: (qmail 46213 invoked by uid 98); 15 May 2004 01:39:09 -0000 Received: from jm@apache.org by hermes.apache.org by uid 82 with qmail-scanner-1.20 (clamuko: 0.70. Clear:RC:0(209.237.227.194):. Processed in 0.034869 secs); 15 May 2004 01:39:09 -0000 X-Qmail-Scanner-Mail-From: jm@apache.org via hermes.apache.org X-Qmail-Scanner: 1.20 (Clear:RC:0(209.237.227.194):. Processed in 0.034869 secs) Received: from unknown (HELO minotaur.apache.org) (209.237.227.194) by hermes.apache.org with SMTP; 15 May 2004 01:39:09 -0000 Received: (qmail 70106 invoked by uid 65534); 15 May 2004 01:38:42 -0000 Date: 15 May 2004 01:38:42 -0000 Message-ID: <20040515013842.70103.qmail@minotaur.apache.org> From: jm@apache.org To: spamassassin-cvs@incubator.apache.org Subject: svn commit: rev 10666 - incubator/spamassassin/trunk/lib/Mail/SpamAssassin X-Spam-Rating: hermes.apache.org 1.6.2 0/1000/N X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N Author: jm Date: Fri May 14 18:38:42 2004 New Revision: 10666 Modified: incubator/spamassassin/trunk/lib/Mail/SpamAssassin/Util.pm Log: bug 3368: URL parsing assumed mailto if scheme was missing in a href. Fixed Modified: incubator/spamassassin/trunk/lib/Mail/SpamAssassin/Util.pm ============================================================================== --- incubator/spamassassin/trunk/lib/Mail/SpamAssassin/Util.pm (original) +++ incubator/spamassassin/trunk/lib/Mail/SpamAssassin/Util.pm Fri May 14 18:38:42 2004 @@ -781,6 +781,14 @@ # Make a copy so we don't trash the original my $nuri = $uri; + if ($nuri !~ /^[a-z0-9_-]+:/i) { # no scheme? + $nuri = "http://".$nuri; # assume HTTP, as a web browser would + # TODO: should we be sensitive to the type of attribute ("href", etc.) + # this appears in? IMO, no, since as far as I can see it doesn't + # make any difference; most browsers/MUAs will assume a default + # of HTTP. + } + # http:www.foo.biz -> http://www.foo.biz $nuri =~ s#^(https?:)/{0,2}#$1//#i;