mirror of
https://github.com/roytam1/palemoon27.git
synced 2026-05-26 14:18:48 +00:00
69d1f32ff7
- Bug 1268085 - Remove unused post barrier callbacks r=terrence (0ab13411c9) - Bug 1267699 - Move some public types to the right namespace; r=sfink (3d5008e610) - Bug 1267550 (part 1) - Rename MOZ_MUST_USE as MOZ_MUST_USE_TYPE. r=ehsan. (6f47375796) - Bug 1259021 - Rename Vector::extractRawBuffer to extractOrCopyRawBuffer r=Waldo (97ca94495b) - Bug 1259021 - Add Vector::extractRawBuffer method that doesn't copy the buffer r=Waldo (e58deec48f) - Bug 1265892 - Change Vector to use Impl::new_ consistently. r=Waldo (7a52d21b29) - Bug 1267912 - Rename nsNetUtil.inl as nsNetUtilInlines.h. r=valentin. (548a41b293) - Bug 1265690 part 1 - Mark StringBuffer methods WARN_UNUSED_RESULT, fix OOM issues. r=jonco (0d7e6837e3) - Bug 1265690 part 2 - Fix some more OOM issues in TypedObject code. r=jonco (b60902453e) - Bug 1263490 - Part 2: Add GetFirstDollarIndex intrinsic and use it inRegExpReplace. r=till (4ba19db8c4) - Bug 1263490 - Part 3: Inline GetFirstDollarIndex intrinsic. r=h4writer (e7d9b5d1cc) - Bug 1263490 - Part 4: Fold GetFirstDollarIndex into a integer constant. r=h4writer (3479c7d1af) - Bug 1267269 - Make MIRType an enum class. r=bbouvier (d580ef372a) - Bug 1259295 - BaldrMonkey: Postorder (r=luke) (6ef7a77663) - Bug 1254142: BaldrMonkey: make br_table yield (r=luke) (80e7635e58) - Bug 1263202 - BaldrMonkey: switch to arities on branches, calls and return (r=bbouvier) (f5a0358634) - Bug 1236358 - Improper reading of string16 in Pickle::ReadString16. r=jld (8370ba6a0b) - Bug 1263205 - BaldrMonkey: Update section headers for proposed spec changes (r=luke) (0def2e6bc2) - Bug 1263205 - BaldrMonkey: Update for proposed new section names (r=luke) (e57f0e3367) - Bug 1263205 - BaldrMonkey: Add 'form' field to types section (r=bbouvier) (794edc890f) - Bug 1259021 - Use in-place storage in AutoStableStringChars to avoid allocation for short strings r=jandem r=Waldo (ffb53cbcf4) - Bug 1267550 (part 2) - Rename MOZ_WARN_UNUSED_RESULT as MOZ_MUST_USE. r=froydnj. (47bc674b86) - Bug 1268518: Baldr: implement int32/int64 rotations; r=luke (0d5eedccce) - Bug 1255008: IonMonkey - Add a by default disabled flow sensitive alias analysis pass, r=jandem (521c585d75) - Bug 1266781: Baldr: implement proper checked truncations to integer types; r=sunfish (46078fb3d3) - Bug 1266781: Rename MTruncateToInt64 into MWasmTruncateInt64; r=sunfish (c7d7d1ac11) - Bug 1266781: Add new traps; r=luke (b7ed3d44e6) - Bug 1268024: Pass the atomic attribute down to EmitHeapAccess; r=luke (6195f7d7a3) - Bug 1268024: A few cleanups related to loads/stores; r=luke (88141e3a01) - Bug 1258312 - Make Pickle::Resize infallible r=jld (241ee9b60d) - Bug 1162772, part 1 - Allow CompartmentCreationOptions to store Secure Context state. r=jorendorff (ff666384cf) - Bug 1162772, part 2 - Expose whether SEC_FORCE_INHERIT_PRINCIPAL was dropped from an nsILoadInfo. r=bz (ada46f86bf) - Bug 1162772, part 3 - Add a getChannelResultPrincipalIfNotSandboxed method to nsIScriptSecurityManager. r=bz (5b1d9f6807) - Bug 1162772, part 4 - Implement nsGlobalWindow::IsSecureContext. r=bz (f392f439c9) - Bug 1162772, part 5 - Expose Window.isSecureContext to content. r=bz (e7296e2cf1) - Bug 1267509 - Make nsContentSecurityManager::IsURIPotentiallyTrustworthy act on an nsIPrincipal. r=bz (83de80350a) - Bug 1219098 - Use UniquePtr in UncompressedSourceCache, for it is good (r=jandem) (b68769c729) - Bug 1244279 - Part 1: Take a bit in ObjectElements::Flags to indicate whether the object is in the whole cell store buffer. r=terrence (968cf373f9) - Bug 1244279 - Part 0: Add a GC ubench for large arrays with both elements and properties. r=terrence (ec76b48323) - Bug 1255925 - Give a name to getters/setters and integer-named methods. r=efaust (f978cc6916) - Bug 888969 - Make the getPrototypeOf/setPrototypeOf traps scriptable. r=efaust, r=bholley (eb2325a9ea) - Bug 1267557 part 0 - Move JS poison constants to jsutil.h. r=jonco (65afc690d2) - Bug 1267557 part 1 - Also poison bytes allocated before the actual jitcode. r=nbp (70f0b327d3) - Bug 1267557 part 2 - Use different jitcode poison values. r=nbp (08008ab9dc) - Bug 1267557 part 3 - Define JS_SWEPT_CODE_PATTERN for mips. r=nbp (17e894d59d) - Bug 1267449 - Do not infinite loop in js_fputs; r=jimb (67f961b6cd) - Bug 1219098 - Reenable compression on large sources, but revert to uncompressed if decompression happens (r=jandem) (b44ee8d77d) - Bug 1267551 (part 1) - Use MOZ_MUST_USE more in jsnum.h. r=jonco. (d2476bf8f4) - Bug 1267551 (part 2) - Use MOZ_MUST_USE more in js/src/ds/. r=jonco. (4ff5d9aa88) - Bug 1267412 - Use MutableHandleValue instead of pointer-to-AutoValueVector; r=sfink (3f6dd284bb) - Bug 1266406 - Use EnumSet<AllocKind> to simplify GC sweeping phase information r=terrence (64811500e7) - Bug 1266457 - Update pointers in GC things in two phases when compacting r=terrence (f6f5bc4e4d) - Bug 1266457 - Simplify typed object trace hook r=terence (3b06c8d1e5) - Bug 1268541 - Compact arenas containing base shapes r=terrence (b458b92eea) - Bug 1268805 - Implement PrivateGCThingValue. (r=terrence) (deec9a83ae) - Bug 1268415: Initialize members in UpdatePointerTasks; r=jonco (6cb219005a) - Bug 1268501 - Release the GC lock periodically when releasing arenas on the backgound thread r=terrence (37f0997682) - Bug 1263572 - Wait for background sweeping to finish before checking base shapes r=terrence (354801a411) - Bug 1266887 - Store Rooted heads on the Zone; r=sfink (91c0101ee3) - Bug 1266402 - Add iteration to EnumSet<T> so that it can be used in range-based for loops r=Waldo (e9507a2524) - Bug 1266404 - Allow construction of an EnumSet<T> using an initializer list r=Waldo (1b6d340e99) - Bug 1254020 - Always compute theme scaling factor when per-monitor dpi aware, even if only a single display is currently present. r=emk (a00cda21f4) - Bug 1263525 - Add dedicated function for std_Array self-hosted intrinsic. r=efaust (449d8bb7eb) - Bug 1255925 - Change JSFunction::name to return a JSAtom. r=efaust (5ab396ce83) - Bug 888969 - Make our tree's sole implementation of nsIRemoteTagService.getRemoteObjectTag not depend upon the infallibility of [[GetPrototypeOf]] on the object provided to it. r=bz (f388f4bf1f) - Bug 1264896 - Kill off nsIRemoteTagService and do what it does, in its sole caller, in far-faster C++. r=billm (5ed3fb103d) - Bug 1268246 - Add a simple Poison class lifetime checker. r=froydnj (7b237bc70e) - Bug 1249496 - Don't apply dpi-based scaling for window titlebar dimensions when on a secondary display, because windows doesn't scale it. r=emk (64dd706dbc) - Bug 1164518 - Avoid unnecessary DB updates when caching Safe Browsing results. r=gcp (3cafd9a4df) - Bug 1264472 - Use nsRunnables in FIDO U2F. r=keeler (3aa9570132) - Bug 1236060 - Dispatch error should advance queue. r=smaug (74155b75dd) - Bug 1251697 part 1. Thread an ErrorResult reference through the worker XHR WorkerThreadProxySyncRunnable implementations. r=khuey (77804cbb7c) - Bug 1251697 part 2. Have WorkerThreadProxySyncRunnable hand the ErrorResult reference it holds to its ResponseRunnable so it can report exceptions on there instead of on a JSContext. r=khuey (355c9ee313) - Bug 1251697 part 3. Remove the JSContext argument of StopSyncLoopRunnable::MaybeSetException. r=khuey (010f5b1058) - Bug 1155328. r=smaug (e1f8dac304) - Bug 1265927: Move nsRunnable to mozilla::Runnable, CancelableRunnable to mozilla::CancelableRunnable. r=froydnj (f83bfcae02) - Bug 1239946 - Change test to return error on Speak. r=eeejay (1d402beb02) - Bug 1254378 - Update synth tests and introduce no voiceschanged test. r=smaug (f5823bb70e) - Bug 1251627. Fix XMLHttpRequest.send() to follow the spec better in terms of the exceptions it throws. r=khuey (cd0e321948) - Bug 1268868: [MSE] P1. Re-enable gap detection within a media segment. r=gerald (b8b8df4bc2) - Bug 1268868: [MSE] P2. Reset longest duration after keyframe is seen. r=gerald (2b1401465c) - Bug 1268868: [MSE] P3. Prevent crash should gap be detected in content. r=gerald (063d9376fc) - Bug 1254378 - Implement nsISynthVoiceRegistry.notifyVoicesChanged. r=smaug (4b63b1c360) - Bug 1266804 - Un-inline js::Unbox(); r=jorendorff (0f288b6173) - Bug 1268863 - Report ScriptSources that are only reachable via AsmJSModule (r=njn) (5ba40acb64) - bump version to 45.1b1 (1414db0ca8) - Bug 1262062 - remove old futex names. r=bbouvier (62662bdd2e) - memory: build fix after renaming MOZ_WARN_UNUSED_RESULT (7254dc8d53) - import from mozilla: - Bug 1268725 - BaldrMonkey: Refactor away the internal storage from ExprIter. r=luke (1931bd636f17) - Bug 1268725 - BaldrMonkey: Convert default arguments into explicit arguments. r=luke (c8a11b8b6bbd) (867ec715d6)
275 lines
8.7 KiB
C++
275 lines
8.7 KiB
C++
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
|
|
/* This Source Code Form is subject to the terms of the Mozilla Public
|
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
|
|
|
#include "mozilla/Logging.h"
|
|
#include "nsAsyncRedirectVerifyHelper.h"
|
|
#include "nsThreadUtils.h"
|
|
#include "nsNetUtil.h"
|
|
|
|
#include "nsIOService.h"
|
|
#include "nsIChannel.h"
|
|
#include "nsIHttpChannelInternal.h"
|
|
#include "nsIAsyncVerifyRedirectCallback.h"
|
|
#include "nsILoadInfo.h"
|
|
|
|
static mozilla::LazyLogModule gRedirectLog("nsRedirect");
|
|
#undef LOG
|
|
#define LOG(args) MOZ_LOG(gRedirectLog, mozilla::LogLevel::Debug, args)
|
|
|
|
NS_IMPL_ISUPPORTS(nsAsyncRedirectVerifyHelper,
|
|
nsIAsyncVerifyRedirectCallback,
|
|
nsIRunnable)
|
|
|
|
class nsAsyncVerifyRedirectCallbackEvent : public mozilla::Runnable {
|
|
public:
|
|
nsAsyncVerifyRedirectCallbackEvent(nsIAsyncVerifyRedirectCallback *cb,
|
|
nsresult result)
|
|
: mCallback(cb), mResult(result) {
|
|
}
|
|
|
|
NS_IMETHOD Run()
|
|
{
|
|
LOG(("nsAsyncVerifyRedirectCallbackEvent::Run() "
|
|
"callback to %p with result %x",
|
|
mCallback.get(), mResult));
|
|
(void) mCallback->OnRedirectVerifyCallback(mResult);
|
|
return NS_OK;
|
|
}
|
|
private:
|
|
nsCOMPtr<nsIAsyncVerifyRedirectCallback> mCallback;
|
|
nsresult mResult;
|
|
};
|
|
|
|
nsAsyncRedirectVerifyHelper::nsAsyncRedirectVerifyHelper()
|
|
: mCallbackInitiated(false),
|
|
mExpectedCallbacks(0),
|
|
mResult(NS_OK)
|
|
{
|
|
}
|
|
|
|
nsAsyncRedirectVerifyHelper::~nsAsyncRedirectVerifyHelper()
|
|
{
|
|
NS_ASSERTION(NS_FAILED(mResult) || mExpectedCallbacks == 0,
|
|
"Did not receive all required callbacks!");
|
|
}
|
|
|
|
nsresult
|
|
nsAsyncRedirectVerifyHelper::Init(nsIChannel* oldChan, nsIChannel* newChan,
|
|
uint32_t flags, bool synchronize)
|
|
{
|
|
LOG(("nsAsyncRedirectVerifyHelper::Init() "
|
|
"oldChan=%p newChan=%p", oldChan, newChan));
|
|
mOldChan = oldChan;
|
|
mNewChan = newChan;
|
|
mFlags = flags;
|
|
mCallbackThread = do_GetCurrentThread();
|
|
|
|
if (!(flags & (nsIChannelEventSink::REDIRECT_INTERNAL |
|
|
nsIChannelEventSink::REDIRECT_STS_UPGRADE))) {
|
|
nsCOMPtr<nsILoadInfo> loadInfo = oldChan->GetLoadInfo();
|
|
if (loadInfo && loadInfo->GetDontFollowRedirects()) {
|
|
ExplicitCallback(NS_BINDING_ABORTED);
|
|
return NS_OK;
|
|
}
|
|
}
|
|
|
|
if (synchronize)
|
|
mWaitingForRedirectCallback = true;
|
|
|
|
nsresult rv;
|
|
rv = NS_DispatchToMainThread(this);
|
|
NS_ENSURE_SUCCESS(rv, rv);
|
|
|
|
if (synchronize) {
|
|
nsIThread *thread = NS_GetCurrentThread();
|
|
while (mWaitingForRedirectCallback) {
|
|
if (!NS_ProcessNextEvent(thread)) {
|
|
return NS_ERROR_UNEXPECTED;
|
|
}
|
|
}
|
|
}
|
|
|
|
return NS_OK;
|
|
}
|
|
|
|
NS_IMETHODIMP
|
|
nsAsyncRedirectVerifyHelper::OnRedirectVerifyCallback(nsresult result)
|
|
{
|
|
LOG(("nsAsyncRedirectVerifyHelper::OnRedirectVerifyCallback() "
|
|
"result=%x expectedCBs=%u mResult=%x",
|
|
result, mExpectedCallbacks, mResult));
|
|
|
|
--mExpectedCallbacks;
|
|
|
|
// If response indicates failure we may call back immediately
|
|
if (NS_FAILED(result)) {
|
|
// We chose to store the first failure-value (as opposed to the last)
|
|
if (NS_SUCCEEDED(mResult))
|
|
mResult = result;
|
|
|
|
// If InitCallback() has been called, just invoke the callback and
|
|
// return. Otherwise it will be invoked from InitCallback()
|
|
if (mCallbackInitiated) {
|
|
ExplicitCallback(mResult);
|
|
return NS_OK;
|
|
}
|
|
}
|
|
|
|
// If the expected-counter is in balance and InitCallback() was called, all
|
|
// sinks have agreed that the redirect is ok and we can invoke our callback
|
|
if (mCallbackInitiated && mExpectedCallbacks == 0) {
|
|
ExplicitCallback(mResult);
|
|
}
|
|
|
|
return NS_OK;
|
|
}
|
|
|
|
nsresult
|
|
nsAsyncRedirectVerifyHelper::DelegateOnChannelRedirect(nsIChannelEventSink *sink,
|
|
nsIChannel *oldChannel,
|
|
nsIChannel *newChannel,
|
|
uint32_t flags)
|
|
{
|
|
LOG(("nsAsyncRedirectVerifyHelper::DelegateOnChannelRedirect() "
|
|
"sink=%p expectedCBs=%u mResult=%x",
|
|
sink, mExpectedCallbacks, mResult));
|
|
|
|
++mExpectedCallbacks;
|
|
|
|
if (IsOldChannelCanceled()) {
|
|
LOG((" old channel has been canceled, cancel the redirect by "
|
|
"emulating OnRedirectVerifyCallback..."));
|
|
(void) OnRedirectVerifyCallback(NS_BINDING_ABORTED);
|
|
return NS_BINDING_ABORTED;
|
|
}
|
|
|
|
nsresult rv =
|
|
sink->AsyncOnChannelRedirect(oldChannel, newChannel, flags, this);
|
|
|
|
LOG((" result=%x expectedCBs=%u", rv, mExpectedCallbacks));
|
|
|
|
// If the sink returns failure from this call the redirect is vetoed. We
|
|
// emulate a callback from the sink in this case in order to perform all
|
|
// the necessary logic.
|
|
if (NS_FAILED(rv)) {
|
|
LOG((" emulating OnRedirectVerifyCallback..."));
|
|
(void) OnRedirectVerifyCallback(rv);
|
|
}
|
|
|
|
return rv; // Return the actual status since our caller may need it
|
|
}
|
|
|
|
void
|
|
nsAsyncRedirectVerifyHelper::ExplicitCallback(nsresult result)
|
|
{
|
|
LOG(("nsAsyncRedirectVerifyHelper::ExplicitCallback() "
|
|
"result=%x expectedCBs=%u mCallbackInitiated=%u mResult=%x",
|
|
result, mExpectedCallbacks, mCallbackInitiated, mResult));
|
|
|
|
nsCOMPtr<nsIAsyncVerifyRedirectCallback>
|
|
callback(do_QueryInterface(mOldChan));
|
|
|
|
if (!callback || !mCallbackThread) {
|
|
LOG(("nsAsyncRedirectVerifyHelper::ExplicitCallback() "
|
|
"callback=%p mCallbackThread=%p", callback.get(), mCallbackThread.get()));
|
|
return;
|
|
}
|
|
|
|
mCallbackInitiated = false; // reset to ensure only one callback
|
|
mWaitingForRedirectCallback = false;
|
|
|
|
// Now, dispatch the callback on the event-target which called Init()
|
|
nsCOMPtr<nsIRunnable> event =
|
|
new nsAsyncVerifyRedirectCallbackEvent(callback, result);
|
|
if (!event) {
|
|
NS_WARNING("nsAsyncRedirectVerifyHelper::ExplicitCallback() "
|
|
"failed creating callback event!");
|
|
return;
|
|
}
|
|
nsresult rv = mCallbackThread->Dispatch(event, NS_DISPATCH_NORMAL);
|
|
if (NS_FAILED(rv)) {
|
|
NS_WARNING("nsAsyncRedirectVerifyHelper::ExplicitCallback() "
|
|
"failed dispatching callback event!");
|
|
} else {
|
|
LOG(("nsAsyncRedirectVerifyHelper::ExplicitCallback() "
|
|
"dispatched callback event=%p", event.get()));
|
|
}
|
|
|
|
}
|
|
|
|
void
|
|
nsAsyncRedirectVerifyHelper::InitCallback()
|
|
{
|
|
LOG(("nsAsyncRedirectVerifyHelper::InitCallback() "
|
|
"expectedCBs=%d mResult=%x", mExpectedCallbacks, mResult));
|
|
|
|
mCallbackInitiated = true;
|
|
|
|
// Invoke the callback if we are done
|
|
if (mExpectedCallbacks == 0)
|
|
ExplicitCallback(mResult);
|
|
}
|
|
|
|
NS_IMETHODIMP
|
|
nsAsyncRedirectVerifyHelper::Run()
|
|
{
|
|
/* If the channel got canceled after it fired AsyncOnChannelRedirect
|
|
* and before we got here, mostly because docloader load has been canceled,
|
|
* we must completely ignore this notification and prevent any further
|
|
* notification.
|
|
*/
|
|
if (IsOldChannelCanceled()) {
|
|
ExplicitCallback(NS_BINDING_ABORTED);
|
|
return NS_OK;
|
|
}
|
|
|
|
// First, the global observer
|
|
NS_ASSERTION(gIOService, "Must have an IO service at this point");
|
|
LOG(("nsAsyncRedirectVerifyHelper::Run() calling gIOService..."));
|
|
nsresult rv = gIOService->AsyncOnChannelRedirect(mOldChan, mNewChan,
|
|
mFlags, this);
|
|
if (NS_FAILED(rv)) {
|
|
ExplicitCallback(rv);
|
|
return NS_OK;
|
|
}
|
|
|
|
// Now, the per-channel observers
|
|
nsCOMPtr<nsIChannelEventSink> sink;
|
|
NS_QueryNotificationCallbacks(mOldChan, sink);
|
|
if (sink) {
|
|
LOG(("nsAsyncRedirectVerifyHelper::Run() calling sink..."));
|
|
rv = DelegateOnChannelRedirect(sink, mOldChan, mNewChan, mFlags);
|
|
}
|
|
|
|
// All invocations to AsyncOnChannelRedirect has been done - call
|
|
// InitCallback() to flag this
|
|
InitCallback();
|
|
return NS_OK;
|
|
}
|
|
|
|
bool
|
|
nsAsyncRedirectVerifyHelper::IsOldChannelCanceled()
|
|
{
|
|
bool canceled;
|
|
nsCOMPtr<nsIHttpChannelInternal> oldChannelInternal =
|
|
do_QueryInterface(mOldChan);
|
|
if (oldChannelInternal) {
|
|
oldChannelInternal->GetCanceled(&canceled);
|
|
if (canceled) {
|
|
return true;
|
|
}
|
|
} else if (mOldChan) {
|
|
// For non-HTTP channels check on the status, failure
|
|
// indicates the channel has probably been canceled.
|
|
nsresult status = NS_ERROR_FAILURE;
|
|
mOldChan->GetStatus(&status);
|
|
if (NS_FAILED(status)) {
|
|
return true;
|
|
}
|
|
}
|
|
|
|
return false;
|
|
}
|