mirror of
https://github.com/roytam1/mozilla45esr.git
synced 2026-05-26 15:39:48 +00:00
import changes from tenfourfox with NSS-related changes excluded, since NSS we used is way newer than tenfourfox's.
https://github.com/classilla/tenfourfox/compare/6251e903f7754959e6bb26bf6388e079602ecb34...3801f0bc4aa10d517737a828356d5c098a3e3fb6 - closes #401: implement conversion script for STS preloads and update from ESR52 (abdf0d5a6) - #400, Bug 1233328 - Part 1: Ignore SHA-1 pins in PublicKeyPinningService.cpp. r=keeler (eb0e2c9c0) - #400: partial Bug 1233328 part 2, pull genHPKPStaticPins.js to esr52 (2ba51bda6) - #400 and #402: update certdata and pinned certs (372305104) - #402: M1364283 (4f32de449) - #402, Bug 1359639 - Ensure a final -1 in mFormat[]. r=valentin, a=gchang (b986d0281) - #402: M1365602 (b18ed9971) - #402: M1356601 (M1353312) (b384d7298) - #402: M1356558 (2adbafdb5) - #402: M1335904 M1357599 (eb8492dd3) - #402, Bug 1363396 - Ensure ContentViewer listeners are handled only when needed. r=mccr8, a=abillings (c1a5c64e7) - #402: M1356755 (d16728f38) - #402: M1355039, tune up M1356755 (4e9af1b2f) - #402: M1360309 (7bf1baf33) - #402: M1348454 (b6849d279) - #402 and #375: M1354294 (e9cd93702) - #402: M1359547 (9a87f47d8) - #403 (#375): last minute perf wins from M1357146 M1363956 (438ff2c96) - #402, #395: remaining sec patches, update blacklist (3801f0bc4)
This commit is contained in:
@@ -5323,11 +5323,16 @@ nsDocShell::Reload(uint32_t aReloadFlags)
|
||||
}
|
||||
}
|
||||
|
||||
rv = InternalLoad(mCurrentURI,
|
||||
// Stack variables to ensure changes to the member variables don't affect
|
||||
// the call.
|
||||
nsCOMPtr<nsIURI> currentURI = mCurrentURI;
|
||||
nsCOMPtr<nsIURI> referrerURI = mReferrerURI;
|
||||
uint32_t referrerPolicy = mReferrerPolicy;
|
||||
rv = InternalLoad(currentURI,
|
||||
originalURI,
|
||||
loadReplace,
|
||||
mReferrerURI,
|
||||
mReferrerPolicy,
|
||||
referrerURI,
|
||||
referrerPolicy,
|
||||
principal,
|
||||
flags,
|
||||
nullptr, // No window target
|
||||
|
||||
Reference in New Issue
Block a user