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 2015/11/24 15:16:17 UTC

svn commit: r1716143 - /spamassassin/branches/3.4/sa-update.raw

Author: mmartinec
Date: Tue Nov 24 14:16:16 2015
New Revision: 1716143

URL: http://svn.apache.org/viewvc?rev=1716143&view=rev
Log:
Bug 7266: scheme name is case insensitive, digits 1-8 are allowed too

Modified:
    spamassassin/branches/3.4/sa-update.raw

Modified: spamassassin/branches/3.4/sa-update.raw
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/sa-update.raw?rev=1716143&r1=1716142&r2=1716143&view=diff
==============================================================================
--- spamassassin/branches/3.4/sa-update.raw (original)
+++ spamassassin/branches/3.4/sa-update.raw Tue Nov 24 14:16:16 2015
@@ -1607,7 +1607,8 @@ sub choose_mirror {
 sub check_mirror_af {
     my ($mirror) = @_;
     my($a_rr, $aaaa_rr);
-    $mirror =~ s/[a-z][a-z09]+:\/\///;  # strip http:// or https:// or other
+      # RFC 3986:  scheme = ALPHA *( ALPHA / DIGIT / "+" / "-" / "." )
+    $mirror =~ s{^[a-z][a-z0-9.+-]*://}{}si;  # strip scheme like http://
     return 1 if $have_inet4 && do_dns_query($mirror, "A");
     return 1 if $have_inet6 && do_dns_query($mirror, "AAAA");
     return 0;