From e48d279609693b4d164199748c93ad791547c649 Mon Sep 17 00:00:00 2001 From: Steve Block Date: Tue, 27 Mar 2012 18:40:26 +0100 Subject: 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 --- LayoutTests/fast/url/script-tests/standard-url.js | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'LayoutTests/fast/url/script-tests/standard-url.js') 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) { -- cgit v1.1