Skip to content

Commit d93247d

Browse files
annevkannevk
authored
Don't decode arbitrary %2e during URL parsing after all
This reverts commit 47d2089 and also updates setter tests that were added later. See whatwg/url#87 for discussion and whatwg/url#156 for the URL Standard PR.
1 parent e001240 commit d93247d

2 files changed

Lines changed: 11 additions & 11 deletions

File tree

‎url/setters_tests.json‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -952,8 +952,8 @@
952952
"href": "view-source+http://example.net/home?lang=fr#nav",
953953
"new_value": "\\a\\%2E\\b\\%2e.\\c",
954954
"expected": {
955-
"href": "view-source+http://example.net/\\a\\.\\b\\..\\c?lang=fr#nav",
956-
"pathname": "/\\a\\.\\b\\..\\c"
955+
"href": "view-source+http://example.net/\\a\\%2E\\b\\%2e.\\c?lang=fr#nav",
956+
"pathname": "/\\a\\%2E\\b\\%2e.\\c"
957957
}
958958
},
959959
{
@@ -966,12 +966,12 @@
966966
}
967967
},
968968
{
969-
"comment": "Bytes already percent-encoded are left as-is, except %2E.",
969+
"comment": "Bytes already percent-encoded are left as-is, including %2E outside dotted segments.",
970970
"href": "http://example.net",
971971
"new_value": "%2e%2E%c3%89té",
972972
"expected": {
973-
"href": "http://example.net/..%c3%89t%C3%A9",
974-
"pathname": "/..%c3%89t%C3%A9"
973+
"href": "http://example.net/%2e%2E%c3%89t%C3%A9",
974+
"pathname": "/%2e%2E%c3%89t%C3%A9"
975975
}
976976
},
977977
{

‎url/urltestdata.json‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1845,30 +1845,30 @@
18451845
{
18461846
"input": "http://example.com/foo/%2e%2",
18471847
"base": "about:blank",
1848-
"href": "http://example.com/foo/.%2",
1848+
"href": "http://example.com/foo/%2e%2",
18491849
"origin": "http://example.com",
18501850
"protocol": "http:",
18511851
"username": "",
18521852
"password": "",
18531853
"host": "example.com",
18541854
"hostname": "example.com",
18551855
"port": "",
1856-
"pathname": "/foo/.%2",
1856+
"pathname": "/foo/%2e%2",
18571857
"search": "",
18581858
"hash": ""
18591859
},
18601860
{
18611861
"input": "http://example.com/foo/%2e./%2e%2e/.%2e/%2e.bar",
18621862
"base": "about:blank",
1863-
"href": "http://example.com/..bar",
1863+
"href": "http://example.com/%2e.bar",
18641864
"origin": "http://example.com",
18651865
"protocol": "http:",
18661866
"username": "",
18671867
"password": "",
18681868
"host": "example.com",
18691869
"hostname": "example.com",
18701870
"port": "",
1871-
"pathname": "/..bar",
1871+
"pathname": "/%2e.bar",
18721872
"search": "",
18731873
"hash": ""
18741874
},
@@ -2286,15 +2286,15 @@
22862286
{
22872287
"input": "http://www/foo%2Ehtml",
22882288
"base": "about:blank",
2289-
"href": "http://www/foo.html",
2289+
"href": "http://www/foo%2Ehtml",
22902290
"origin": "http://www",
22912291
"protocol": "http:",
22922292
"username": "",
22932293
"password": "",
22942294
"host": "www",
22952295
"hostname": "www",
22962296
"port": "",
2297-
"pathname": "/foo.html",
2297+
"pathname": "/foo%2Ehtml",
22982298
"search": "",
22992299
"hash": ""
23002300
},

0 commit comments

Comments
 (0)