mirror of
https://github.com/roytam1/palemoon27.git
synced 2026-05-26 14:18:48 +00:00
import changes from `dev' branch of rmottola/Arctic-Fox:
- Bug 1152046 - Don't try to connect if we are shutting down. r=mayhemer (aae69c9a8a)
- Bug 1130444 - Add telemetry for measuring SocketTransortService cycles; r=mcmanus (d98dc06843)
- Bug 1131557 - Serve multiple xpcom events in one poll iteration. r=mcmanus (fd89c41f6a)
- Bug 1152048 - release assert non-reentrancy of sts lock acquisition. r=honzab DONTBUILD relanding (0e29dddb0b)
- Bug 1152046 - Make separate thread only for PRClose. r=mcmanus r=mayhemer (ead318fbc3)
- add two missing bits of previous patches (ee264a4f4f)
- Bug 1169554 - Do not reconnect on shutdown. r=mayhemer (e5b4b36fd1)
- Bug 1186152 - Implement nsIProtocolHandlerWithDynamicFlags and use it for moz-extension. r=bz (cc0a9a7b36)
- Bug 1152048 - Send wakeup notification asynchronously to avoid reentrancy issues. r=bagder (76f9c5a7e4)
- Bug 1186732 - Implement an about:blank page inside of moz-extension. r=billm (9c37bcd67c)
- Bug 1186155 - Use UNIFIED_SOURCES in netwerk/protocol/res. r=billm,sr=mcmanus (2e376471a7)
- Bug 1162657 - Turn NewChannel deprecation warnings into assertions (r=sworkman,sicking,paolo) (03bbd5871d)
- Bug 1182515 - Clear reference to captive portal service when observing xpcom-shutdown. r=mcmanus (aeed32058d)
- Bug 1109608 - Log.stackTrace should use human-readable task stack traces if available. r=Yoric (33ec6724b9)- fix misspatch (ca5c2d2259)
- fix misspatch (ca5c2d2259)
- Bug 1169129 - reset media.{0}.trial-create on GMP install. r=spohl Bug 1205178 - Make GMPProvider check that GMPs are the right arch before loading. r=spohl (5ff304963b)
This commit is contained in:
@@ -768,16 +768,6 @@ nsScriptSecurityManager::CheckLoadURIWithPrincipal(nsIPrincipal* aPrincipal,
|
||||
// the methods that work on chains of nested URIs and they will only look
|
||||
// at the flags for our one URI.
|
||||
|
||||
// Special case: moz-extension has a whitelist of URIs that are loadable by
|
||||
// anyone.
|
||||
if (targetScheme.EqualsLiteral("moz-extension") && GetAddonPolicyService()) {
|
||||
bool loadable = false;
|
||||
rv = GetAddonPolicyService()->ExtensionURILoadableByAnyone(targetBaseURI, &loadable);
|
||||
if (NS_SUCCEEDED(rv) && loadable) {
|
||||
return NS_OK;
|
||||
}
|
||||
}
|
||||
|
||||
// Check for system target URI
|
||||
rv = DenyAccessIfURIHasFlags(targetBaseURI,
|
||||
nsIProtocolHandler::URI_DANGEROUS_TO_LOAD);
|
||||
|
||||
Reference in New Issue
Block a user