Backout of 7f28c1084c47 (bug 1319111) for security checks breakage, r=me

This commit is contained in:
Honza Bambas
2017-05-25 18:16:02 +02:00
parent 4c32091f80
commit 00cefdc449
25 changed files with 129 additions and 255 deletions

View File

@@ -11168,12 +11168,6 @@ nsDocShell::DoURILoad(nsIURI* aURI,
if (aOriginalURI) {
channel->SetOriginalURI(aOriginalURI);
// The LOAD_REPLACE flag and its handling here will be removed as part
// of bug 1319110. For now preserve its restoration here to not break
// any code expecting it being set specially on redirected channels.
// If the flag has originally been set to change result of
// NS_GetFinalChannelURI it won't have any effect and also won't cause
// any harm.
if (aLoadReplace) {
uint32_t loadFlags;
channel->GetLoadFlags(&loadFlags);