summaryrefslogtreecommitdiffstats
path: root/LayoutTests/fast/url/script-tests/standard-url.js
diff options
context:
space:
mode:
authorSteve Block <steveblock@google.com>2012-03-27 18:40:26 +0100
committerSteve Block <steveblock@google.com>2012-03-28 16:54:59 +0100
commite48d279609693b4d164199748c93ad791547c649 (patch)
tree25780dbbd84520d51c0fd174a299121e0d46f5e2 /LayoutTests/fast/url/script-tests/standard-url.js
parentc57e584da242d96ba18578a71f4634adc9d1fff6 (diff)
downloadexternal_webkit-e48d279609693b4d164199748c93ad791547c649.zip
external_webkit-e48d279609693b4d164199748c93ad791547c649.tar.gz
external_webkit-e48d279609693b4d164199748c93ad791547c649.tar.bz2
Cherry-pick WebKit change r96779 to fix window.location
See http://trac.webkit.org/changeset/96779 Note that a conflict occurred in Source/WebCore/platform/qt/KURLQt.cpp but the change is not required. Bug: 2159848 Change-Id: I56e645b2f187302c6f1858c8c6c291209f130cad
Diffstat (limited to 'LayoutTests/fast/url/script-tests/standard-url.js')
-rw-r--r--LayoutTests/fast/url/script-tests/standard-url.js7
1 files changed, 6 insertions, 1 deletions
diff --git a/LayoutTests/fast/url/script-tests/standard-url.js b/LayoutTests/fast/url/script-tests/standard-url.js
index 27afe76..5611faa 100644
--- a/LayoutTests/fast/url/script-tests/standard-url.js
+++ b/LayoutTests/fast/url/script-tests/standard-url.js
@@ -1,8 +1,10 @@
description("Canonicalization of standard URLs");
-cases = [
+cases = [
["http://www.google.com/foo?bar=baz#", "http://www.google.com/foo?bar=baz#"],
+ ["http://www.google.com/foo?bar=baz# \u00bb", "http://www.google.com/foo?bar=baz# \u00bb"],
["http://[www.google.com]/", "http://[www.google.com]/"],
+ ["http://www.google.com", "http://www.google.com/"],
// Disabled because whitespace gets treated different in this API.
// ["ht\ttp:@www.google.com:80/;p?#", "ht%09tp://www.google.com:80/;p?#"],
["http:////////user:@google.com:99?foo", "http://user@google.com:99/?foo"],
@@ -58,6 +60,9 @@ cases = [
["data:example.com/", "data:example.com/"],
["javascript:example.com/", "javascript:example.com/"],
["mailto:example.com/", "mailto:example.com/"],
+ // Escaping of non hierarchical URLs
+ ["javascript:alert(\\t 1 \\n\\r)", "javascript:alert( 1 )"],
+ ['javascript:alert(" \1 \u03B2 ")', 'javascript:alert(" %01 %CE%B2 ")'],
];
for (var i = 0; i < cases.length; ++i) {