Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-16 06:45:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Backed out changeset 9c05226e2248 (bug 1405174) for failing browser-chrome's toolkit/components/addoncompat/tests/browser/browser_addonShims.js and netwerk/test/browser/browser_child_resource.js. r=backout

Browse Source
This commit is contained in:
Sebastian Hengst 2017-10-04 01:19:30 +02:00
parent be4fbc10e3
commit ebd4a79eb5
2 changed files with 1 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
netwerk/protocol/res/SubstitutingProtocolHandler.cpp
View File

@ -425,19 +425,7 @@ SubstitutingProtocolHandler::ResolveURI(nsIURI *uri, nsACString &result)
rv = baseURI->GetSpec(result);
} else {
// Make sure we always resolve the path as file-relative to our target URI.
// When the baseURI doesn't end with a /, a file-relative resolution is going
// to pick something in the parent directory, so we resolve using an absolute
// path derived from the full path of the baseURI in that case.
nsAutoCString basePath;
rv = baseURI->GetFilePath(basePath);
if (NS_SUCCEEDED(rv) && !StringEndsWith(basePath, NS_LITERAL_CSTRING("/"))) {
// Cf. the assertion above, path already starts with a /, so prefixing
// with a string that doesn't end with one will leave us wit the right
// amount of /.
path.Insert(basePath, 0);
} else {
path.Insert('.', 0);
}
path.Insert('.', 0);
rv = baseURI->Resolve(path, result);
}

7
netwerk/test/unit/test_bug337744.js
View File

@ -94,15 +94,9 @@ function run_test() {
let rootFile = Services.dirsvc.get("GreD", Ci.nsIFile);
let rootURI = Services.io.newFileURI(rootFile);
let inexistentFile = Cc["@mozilla.org/file/local;1"].createInstance(Ci.nsIFile);
inexistentFile.initWithPath("/this/directory/does/not/exist");
let inexistentURI = Services.io.newFileURI(inexistentFile);
resProto.setSubstitution("res-test", rootURI);
resProto.setSubstitution("res-inexistent", inexistentURI);
do_register_cleanup(() => {
resProto.setSubstitution("res-test", null);
resProto.setSubstitution("res-inexistent", null);
});
let baseRoot = resProto.resolveURI(Services.io.newURI("resource:///"));
@ -110,7 +104,6 @@ function run_test() {
for (var spec of specs) {
check_safe_resolution(spec, rootURI.spec);
check_safe_resolution(spec.replace("res-test", "res-inexistent"), inexistentURI.spec);
check_safe_resolution(spec.replace("res-test", ""), baseRoot);
check_safe_resolution(spec.replace("res-test", "gre"), greRoot);
}