From 07ffee641174b4c43986cd516fc39eec2d91a90e Mon Sep 17 00:00:00 2001 From: Tim Graham Date: Thu, 11 Feb 2016 10:39:53 -0500 Subject: [1.9.x] Fixed #26204 -- Reallowed dashes in top-level domains for URLValidator. Thanks Shai Berger for the review. Backport of b1afebf882db5296cd9dcea26ee66d5250922e53 from master --- tests/validators/invalid_urls.txt | 4 +++- tests/validators/valid_urls.txt | 4 ++++ 2 files changed, 7 insertions(+), 1 deletion(-) (limited to 'tests') diff --git a/tests/validators/invalid_urls.txt b/tests/validators/invalid_urls.txt index 12a1226359..f8711bf457 100644 --- a/tests/validators/invalid_urls.txt +++ b/tests/validators/invalid_urls.txt @@ -6,7 +6,7 @@ http://.com http://invalid-.com http://-invalid.com http://invalid.com- -http://invalid.c-m +http://invalid.-com http://inv-.alid-.com http://inv-.-alid.com file://localhost/path @@ -33,6 +33,8 @@ http:// shouldfail.com :// should fail http://foo.bar/foo(bar)baz quux http://-error-.invalid/ +http://dashinpunytld.trailingdot.xn--. +http://dashinpunytld.xn--- http://-a.b.co http://a.b-.co http://a.-b.co diff --git a/tests/validators/valid_urls.txt b/tests/validators/valid_urls.txt index ad30811177..7732165f64 100644 --- a/tests/validators/valid_urls.txt +++ b/tests/validators/valid_urls.txt @@ -63,3 +63,7 @@ http://0.0.0.0/ http://255.255.255.255 http://224.0.0.0 http://224.1.1.1 +http://dashintld.c-m +http://multipledashintld.a-b-c +http://evenmoredashintld.a---c +http://dashinpunytld.xn---c -- cgit v1.3