import change from tenfourfox:

- #614: M1642792 M1650811 M1634872 (9e33379e7)
- #614: update TLDs, HSTS (fee8edf77)
This commit is contained in:
2020-08-05 12:24:36 +08:00
parent d68e5b7fcb
commit 61184c458f
6 changed files with 3707 additions and 3460 deletions
+9 -7
View File
@@ -902,14 +902,16 @@ private:
rv = NS_GetFinalChannelURI(channel, getter_AddRefs(finalURI));
NS_ENSURE_SUCCESS(rv, rv);
nsCString filename;
rv = finalURI->GetSpec(filename);
NS_ENSURE_SUCCESS(rv, rv);
if (principal->Subsumes(channelPrincipal)) {
nsCString filename;
rv = finalURI->GetSpec(filename);
NS_ENSURE_SUCCESS(rv, rv);
if (!filename.IsEmpty()) {
// This will help callers figure out what their script url resolved to in
// case of errors.
aLoadInfo.mURL.Assign(NS_ConvertUTF8toUTF16(filename));
if (!filename.IsEmpty()) {
// This will help callers figure out what their script url resolved to in
// case of errors.
aLoadInfo.mURL.Assign(NS_ConvertUTF8toUTF16(filename));
}
}
// Update the principal of the worker and its base URI if we just loaded the