URL: make gopher behave like unrecognized schemes

See whatwg/url#342 for context.
web-platform-tests · Oct 18, 2019 · 8a9d0cc · 8a9d0cc
1 parent 1bf526e
commit 8a9d0cc
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 27 deletions.
diff --git a/html/browsers/history/the-location-interface/location-protocol-setter-non-broken-weird.html b/html/browsers/history/the-location-interface/location-protocol-setter-non-broken-weird.html
@@ -17,7 +17,6 @@
     'data',
     'file',
     'ftp',
-    'gopher',
     'http+x'
   ].forEach((val, index) => {
     async_test((t) => {

diff --git a/html/browsers/history/the-location-interface/location-protocol-setter-non-broken.html b/html/browsers/history/the-location-interface/location-protocol-setter-non-broken.html
@@ -12,7 +12,6 @@
     // 'mailto' opens an email client in Firefox...
     'file',
     'ftp',
-    'gopher',
     'http+x'
   ].forEach((val) => {
     async_test((t) => {

diff --git a/url/failure.html b/url/failure.html
@@ -1,6 +1,7 @@
 <!doctype html>
 <meta charset=utf-8>
 <title>Test URL parser failure consistency</title>
+<meta name=timeout content=long>
 <script src=/resources/testharness.js></script>
 <script src=/resources/testharnessreport.js></script>
 <div id=log></div>

diff --git a/url/resources/urltestdata.json b/url/resources/urltestdata.json
@@ -1076,15 +1076,15 @@
   {
     "input": "gopher:/example.com/",
     "base": "http://example.org/foo/bar",
-    "href": "gopher://example.com/",
-    "origin": "gopher://example.com",
+    "href": "gopher:/example.com/",
+    "origin": "null",
     "protocol": "gopher:",
     "username": "",
     "password": "",
-    "host": "example.com",
-    "hostname": "example.com",
+    "host": "",
+    "hostname": "",
     "port": "",
-    "pathname": "/",
+    "pathname": "/example.com/",
     "search": "",
     "hash": ""
   },
@@ -1241,15 +1241,15 @@
   {
     "input": "gopher:example.com/",
     "base": "http://example.org/foo/bar",
-    "href": "gopher://example.com/",
-    "origin": "gopher://example.com",
+    "href": "gopher:example.com/",
+    "origin": "null",
     "protocol": "gopher:",
     "username": "",
     "password": "",
-    "host": "example.com",
-    "hostname": "example.com",
+    "host": "",
+    "hostname": "",
     "port": "",
-    "pathname": "/",
+    "pathname": "example.com/",
     "search": "",
     "hash": ""
   },
@@ -2511,14 +2511,14 @@
   {
     "input": "gopher://foo:70/",
     "base": "about:blank",
-    "href": "gopher://foo/",
-    "origin": "gopher://foo",
+    "href": "gopher://foo:70/",
+    "origin": "null",
     "protocol": "gopher:",
     "username": "",
     "password": "",
-    "host": "foo",
+    "host": "foo:70",
     "hostname": "foo",
-    "port": "",
+    "port": "70",
     "pathname": "/",
     "search": "",
     "hash": ""
@@ -2527,7 +2527,7 @@
     "input": "gopher://foo:443/",
     "base": "about:blank",
     "href": "gopher://foo:443/",
-    "origin": "gopher://foo:443",
+    "origin": "null",
     "protocol": "gopher:",
     "username": "",
     "password": "",
@@ -2750,15 +2750,15 @@
   {
     "input": "gopher:/example.com/",
     "base": "about:blank",
-    "href": "gopher://example.com/",
-    "origin": "gopher://example.com",
+    "href": "gopher:/example.com/",
+    "origin": "null",
     "protocol": "gopher:",
     "username": "",
     "password": "",
-    "host": "example.com",
-    "hostname": "example.com",
+    "host": "",
+    "hostname": "",
     "port": "",
-    "pathname": "/",
+    "pathname": "/example.com/",
     "search": "",
     "hash": ""
   },
@@ -2915,15 +2915,15 @@
   {
     "input": "gopher:example.com/",
     "base": "about:blank",
-    "href": "gopher://example.com/",
-    "origin": "gopher://example.com",
+    "href": "gopher:example.com/",
+    "origin": "null",
     "protocol": "gopher:",
     "username": "",
     "password": "",
-    "host": "example.com",
-    "hostname": "example.com",
+    "host": "",
+    "hostname": "",
     "port": "",
-    "pathname": "/",
+    "pathname": "example.com/",
     "search": "",
     "hash": ""
   },