diff options
| author | Steve Block <steveblock@google.com> | 2012-03-27 18:40:26 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2012-03-28 16:54:59 +0100 |
| commit | e48d279609693b4d164199748c93ad791547c649 (patch) | |
| tree | 25780dbbd84520d51c0fd174a299121e0d46f5e2 /LayoutTests/fast/url/script-tests/file-http-base.js | |
| parent | c57e584da242d96ba18578a71f4634adc9d1fff6 (diff) | |
| download | external_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/file-http-base.js')
| -rw-r--r-- | LayoutTests/fast/url/script-tests/file-http-base.js | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/LayoutTests/fast/url/script-tests/file-http-base.js b/LayoutTests/fast/url/script-tests/file-http-base.js index ca9e734..00965b8 100644 --- a/LayoutTests/fast/url/script-tests/file-http-base.js +++ b/LayoutTests/fast/url/script-tests/file-http-base.js @@ -36,7 +36,8 @@ cases = [ // Make sure relative paths can't go above the "C:" ["file:///C:/foo/../../../bar.html", "file:///C:/bar.html"], // Busted refs shouldn't make the whole thing fail. - ["file:///C:/asdf#\\xc2", "file:///C:/asdf#\\xef\\xbf\\xbd"], + ["file:///C:/asdf#\\xc2", "file:///C:/asdf#\\xc2"], + ["file:///C:/asdf#\xc2", "file:///C:/asdf#\xc2"], // Unix-style paths ["file:///home/me", "file:///home/me"], |