corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge inbound to m-c a=merge CLOSED TREE

Browse Source 
MozReview-Commit-ID: 3pMHYV9oXLm
This commit is contained in:
Wes Kocher
2017-09-27 16:51:49 -07:00
parent 030f1836be 5824606ba3
commit cbba752608
175 changed files with 1752 additions and 32962 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docshell/base/nsDocShell.cpp
View File

@@ -10983,7 +10983,7 @@ IsConsideredSameOriginForUIR(nsIPrincipal* aTriggeringPrincipal,
rv = resultURI->GetSpec(tmpResultSpec);
NS_ENSURE_SUCCESS(rv, false);
// replace http with https
tmpResultSpec.Replace(0, 4, "https");
tmpResultSpec.ReplaceLiteral(0, 4, "https");
nsCOMPtr<nsIURI> tmpResultURI;
rv = NS_NewURI(getter_AddRefs(tmpResultURI), tmpResultSpec);