diff options
| author | Steve Block <steveblock@google.com> | 2012-04-12 07:44:24 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-04-12 07:44:24 -0700 |
| commit | 2d59667e270387d6bf950a6cf680ab3fe0912808 (patch) | |
| tree | ffbd418bdade008597f9876d54790132013ed1ed /LayoutTests/fast/url/script-tests/segments.js | |
| parent | 5d30564f8e741f67bddb7075478dc1954b7862f9 (diff) | |
| parent | db951b2c4c8fce1304a13d97dec4ae14be629380 (diff) | |
| download | external_webkit-2d59667e270387d6bf950a6cf680ab3fe0912808.zip external_webkit-2d59667e270387d6bf950a6cf680ab3fe0912808.tar.gz external_webkit-2d59667e270387d6bf950a6cf680ab3fe0912808.tar.bz2 | |
Merge "Cherry-pick WebKit change r84762 to fix URL canonicalization"
Diffstat (limited to 'LayoutTests/fast/url/script-tests/segments.js')
| -rw-r--r-- | LayoutTests/fast/url/script-tests/segments.js | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/LayoutTests/fast/url/script-tests/segments.js b/LayoutTests/fast/url/script-tests/segments.js index a826703..037f243 100644 --- a/LayoutTests/fast/url/script-tests/segments.js +++ b/LayoutTests/fast/url/script-tests/segments.js @@ -73,14 +73,25 @@ cases = [ ["https:/example.com/", ["https:","example.com","0","/","",""]], ["madeupscheme:/example.com/", ["madeupscheme:","","0","/example.com/","",""]], ["file:/example.com/", ["file:","","0","/example.com/","",""]], - ["fops:/example.com/", ["fops:","","0","/example.com/","",""]], + ["ftps:/example.com/", ["ftps:","","0","/example.com/","",""]], ["gopher:/example.com/", ["gopher:","example.com","0","/","",""]], ["ws:/example.com/", ["ws:","example.com","0","/","",""]], ["wss:/example.com/", ["wss:","example.com","0","/","",""]], ["data:/example.com/", ["data:","","0","/example.com/","",""]], ["javascript:/example.com/", ["javascript:","","0","/example.com/","",""]], ["mailto:/example.com/", ["mailto:","","0","/example.com/","",""]], - + ["http:example.com/", ["http:","example.org","0","/foo/example.com/","",""]], + ["ftp:example.com/", ["ftp:","example.com","0","/","",""]], + ["https:example.com/", ["https:","example.com","0","/","",""]], + ["madeupscheme:example.com/", ["madeupscheme:","","0","example.com/","",""]], + ["file:example.com/", ["file:","","0","/example.com/","",""]], + ["ftps:example.com/", ["ftps:","","0","example.com/","",""]], + ["gopher:example.com/", ["gopher:","example.com","0","/","",""]], + ["ws:example.com/", ["ws:","example.com","0","/","",""]], + ["wss:example.com/", ["wss:","example.com","0","/","",""]], + ["data:example.com/", ["data:","","0","example.com/","",""]], + ["javascript:example.com/", ["javascript:","","0","example.com/","",""]], + ["mailto:example.com/", ["mailto:","","0","example.com/","",""]], ]; var originalBaseURL = canonicalize("."); |