diff options
| author | Ben Murdoch <benm@google.com> | 2010-10-22 13:02:20 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2010-10-26 15:21:41 +0100 |
| commit | a94275402997c11dd2e778633dacf4b7e630a35d (patch) | |
| tree | e66f56c67e3b01f22c9c23cd932271ee9ac558ed /LayoutTests/fast/url | |
| parent | 09e26c78506587b3f5d930d7bc72a23287ffbec0 (diff) | |
| download | external_webkit-a94275402997c11dd2e778633dacf4b7e630a35d.zip external_webkit-a94275402997c11dd2e778633dacf4b7e630a35d.tar.gz external_webkit-a94275402997c11dd2e778633dacf4b7e630a35d.tar.bz2 | |
Merge WebKit at r70209: Initial merge by Git
Change-Id: Id23a68efa36e9d1126bcce0b137872db00892c8e
Diffstat (limited to 'LayoutTests/fast/url')
5 files changed, 5 insertions, 5 deletions
diff --git a/LayoutTests/fast/url/query-expected.txt b/LayoutTests/fast/url/query-expected.txt index 9941416..e4816a5 100644 --- a/LayoutTests/fast/url/query-expected.txt +++ b/LayoutTests/fast/url/query-expected.txt @@ -5,7 +5,7 @@ On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE PASS canonicalize('http://www.example.com/?foo=bar') is 'http://www.example.com/?foo=bar' PASS canonicalize('http://www.example.com/?as?df') is 'http://www.example.com/?as?df' -FAIL canonicalize('http://www.example.com/?\x02hello bye') should be http://www.example.com/?%02hello%7F%20bye. Was http://www.example.com/?hello%7F%20bye. +PASS canonicalize('http://www.example.com/?\x02hello bye') is 'http://www.example.com/?%02hello%7F%20bye' PASS canonicalize('http://www.example.com/?%40%41123') is 'http://www.example.com/?%40%41123' PASS canonicalize('http://www.example.com/?q=你好') is 'http://www.example.com/?q=%26%2320320%3B%26%2322909%3B' PASS canonicalize('http://www.example.com/?q=\ud800\ud800') is 'http://www.example.com/?q=%26%2355296%3B%26%2355296%3B' diff --git a/LayoutTests/fast/url/script-tests/segments-from-data-url.js b/LayoutTests/fast/url/script-tests/segments-from-data-url.js index 8fc3013..5c4ae02 100644 --- a/LayoutTests/fast/url/script-tests/segments-from-data-url.js +++ b/LayoutTests/fast/url/script-tests/segments-from-data-url.js @@ -14,7 +14,7 @@ cases = [ ["http://f:00000000000000000000080/c", ["http:","f","0","/c","",""]], ["http://f:b/c", [":","","0","","",""]], ["http://f: /c", [":","","0","","",""]], - ["http://f:\\n/c", ["http:","f","0","/c","",""]], + ["http://f:\\n/c", [":","","0","","",""]], ["http://f:fifty-two/c", [":","","0","","",""]], ["http://f:999999/c", [":","","0","","",""]], ["http://f: 21 / b ? d # e ", [":","","0","","",""]], diff --git a/LayoutTests/fast/url/script-tests/segments.js b/LayoutTests/fast/url/script-tests/segments.js index c0c6fa1..c621da1 100644 --- a/LayoutTests/fast/url/script-tests/segments.js +++ b/LayoutTests/fast/url/script-tests/segments.js @@ -14,7 +14,7 @@ cases = [ ["http://f:00000000000000000000080/c", ["http:","f","0","/c","",""]], ["http://f:b/c", [":","","0","","",""]], ["http://f: /c", [":","","0","","",""]], - ["http://f:\\n/c", ["http:","f","0","/c","",""]], + ["http://f:\\n/c", [":","","0","","",""]], ["http://f:fifty-two/c", [":","","0","","",""]], ["http://f:999999/c", [":","","0","","",""]], ["http://f: 21 / b ? d # e ", [":","","0","","",""]], diff --git a/LayoutTests/fast/url/segments-expected.txt b/LayoutTests/fast/url/segments-expected.txt index 3833f36..2da6912 100644 --- a/LayoutTests/fast/url/segments-expected.txt +++ b/LayoutTests/fast/url/segments-expected.txt @@ -15,7 +15,7 @@ PASS segments('http://f:00000000000000/c') is '["http:","f","0","/c","",""]' FAIL segments('http://f:00000000000000000000080/c') should be ["http:","f","0","/c","",""]. Was ["http:","f","80","/c","",""]. PASS segments('http://f:b/c') is '[":","","0","","",""]' PASS segments('http://f: /c') is '[":","","0","","",""]' -PASS segments('http://f:\n/c') is '["http:","f","0","/c","",""]' +PASS segments('http://f:\n/c') is '[":","","0","","",""]' PASS segments('http://f:fifty-two/c') is '[":","","0","","",""]' FAIL segments('http://f:999999/c') should be [":","","0","","",""]. Was ["http:","f","65535","/c","",""]. PASS segments('http://f: 21 / b ? d # e ') is '[":","","0","","",""]' diff --git a/LayoutTests/fast/url/segments-from-data-url-expected.txt b/LayoutTests/fast/url/segments-from-data-url-expected.txt index 5d102ef..6e1853e 100644 --- a/LayoutTests/fast/url/segments-from-data-url-expected.txt +++ b/LayoutTests/fast/url/segments-from-data-url-expected.txt @@ -15,7 +15,7 @@ PASS segments('http://f:00000000000000/c') is '["http:","f","0","/c","",""]' FAIL segments('http://f:00000000000000000000080/c') should be ["http:","f","0","/c","",""]. Was ["http:","f","80","/c","",""]. PASS segments('http://f:b/c') is '[":","","0","","",""]' PASS segments('http://f: /c') is '[":","","0","","",""]' -PASS segments('http://f:\n/c') is '["http:","f","0","/c","",""]' +PASS segments('http://f:\n/c') is '[":","","0","","",""]' PASS segments('http://f:fifty-two/c') is '[":","","0","","",""]' FAIL segments('http://f:999999/c') should be [":","","0","","",""]. Was ["http:","f","65535","/c","",""]. PASS segments('http://f: 21 / b ? d # e ') is '[":","","0","","",""]' |