mirror of
https://github.com/roytam1/palemoon27.git
synced 2026-05-26 14:30:27 +00:00
212144c57f
- Bug 1153936 - nsIHttpChannelInteral attribute to opt out of alt-svc on per channel basis r=hurley (0e5667321) - Bug 1137287 - Part 2: Send non-200/404 synthesized responses via the parent HTTP implementation for proper processing. r=mayhemer (3c38a1908) - Bug 1137287 - Part 0: Test for synthesized redirects. r=jdm (6f12f95de) - Bug 1137287 - Build fix. rs=KWierso for a CLOSED TREE (85694256a) - Bug 1095098 - move do_QueryObject templates into their own header; r=froydnj (5d349c248) - Bug 1095098 - followup - add back some static analysis attributes lost in a rebase; r=me (917a6b5da) - Bug 1159303 - Reduce noise due to sort operations warnings. r=bent (cac3c3e12) - Bug 1164559 - Part 1: Remove instances of #ifdef PR_LOGGING in storage. r=froydnj (5dd0f92b0) - Bug 1164559 - Part 2: Wrap expensive calls in PR_LOG_TEST. r=froydnj (54e94d1ce) - Bug 1148833 part 1 - Remove nsMathMLContainerFrame::WillReflow, reset the NS_MATHML_ERROR bit at the start of Reflow instead. r=roc (803abb8d9) - Bug 1148833 part 2 - Makes sure gLogModule is initialized by calling GetLogModuleInfo(). r=roc (722e2019d) - Bug 1148833 part 3 - Remove nsIFrame::WillReflow and add a non-virtual MarkInReflow method instead that sets NS_FRAME_IN_REFLOW. Call it at the start of Reflow(). r=roc (9cceb221d) - Bug 1148833 part 4 - Fix indentation of some Reflow params (white-space changes only). (b2ba3e18a) - Bug 1158546 - Remove nsDisplayHeaderFooter::mFrame in favor of nsDisplayItem::mFrame; r=roc (f6a20967f) - Bug 1162673 - Part 1: Remove instances of #ifdef PR_LOGGING in layout. r=froydnj (453a452fc) - Bug 1162673 - Part 2: Wrap expensive calls in PR_LOG_TEST. r=froydnj (d745eab19) - Bug 1144031 - fix use of uninitialized variable, r=mcmanus (327dc1af9) - Bug 1144270 : Update remaining callers of newChannel to newChannel2 in netwerk/ (r=mcmanus) (60c21d7cb) - Bug 1161558 cleanup some nsIObserver shutdown paths r=bagder (eb8441bb9) - Bug 1162336 - Part 1: Remove instances of #ifdef PR_LOGGING in netwerk. r=froydnj (8cadc40a2) - Bug 1162336 - Part 2: Wrap expensive calls in PR_LOG_TEST. r=froydnj (4e26e4886) - Bug 1163194 - Part 1: Remove instances of #ifdef PR_LOGGING in dom/xul. r=froydnj (4f840564b) - Bug 1163194 - Part 2: Wrap expensive calls in PR_LOG_TEST. r=froydnj (653707f34) - Bug 1153737: Avoid unnecessary uses of mozilla::pkix::ScopedPtr, r=keeler (fd9eb9aa2) - Bug 1038072 - signature verification for JAR files unpacked into a directory. r=keeler (32469e1dd) - Bug 1124076 - Properly detect certs when loaded and prompt to import them. r=sworkman/dkeeler (d860e3cac) - Bug 1124076 followup - fix the build when PR_LOGGING is not defined. r=mrbkap (657b18bf2) - Bug 1162691 - Part 1: Remove instances of #ifdef PR_LOGGING in security. r=froydnj (98a916e82) - Bug 1162691 - Part 2: Wrap expensive calls in PR_LOG_TEST. r=froydnj (000c2fe42) - bug 1147085 - remove nsINSSCertCache (replace it with nsIX509CertDB.getCerts()) r=Cykesiopka (88f7eba23) - Bug 1149888 - Make PLDHashTable::mRecursionLevel atomic, r=froydnj. Pushing on CLOSED TREE with a=ryanvm. (25d8e2da1) - Bug 1050035 (part 1, attempt 2) - Lazily allocate PLDHashTable::mEntryStore. r=froydnj. (195615f16) - Bug 1159972 - Remove the fallible version of PL_DHashTableInit(). r=froydnj. (d31806eeb)
416 lines
9.8 KiB
C++
416 lines
9.8 KiB
C++
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
|
|
/* vim: set ts=2 et sw=2 tw=80: */
|
|
/* 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 "FileStreamWrappers.h"
|
|
|
|
#include "FileHelper.h"
|
|
#include "MainThreadUtils.h"
|
|
#include "mozilla/Assertions.h"
|
|
#include "mozilla/Attributes.h"
|
|
#include "mozilla/ipc/InputStreamParams.h"
|
|
#include "MutableFile.h"
|
|
#include "nsDebug.h"
|
|
#include "nsError.h"
|
|
#include "nsIRunnable.h"
|
|
#include "nsISeekableStream.h"
|
|
#include "nsThreadUtils.h"
|
|
#include "nsQueryObject.h"
|
|
|
|
#ifdef DEBUG
|
|
#include "nsXULAppAPI.h"
|
|
#endif
|
|
|
|
namespace mozilla {
|
|
namespace dom {
|
|
|
|
namespace {
|
|
|
|
class ProgressRunnable final : public nsIRunnable
|
|
{
|
|
public:
|
|
NS_DECL_THREADSAFE_ISUPPORTS
|
|
NS_DECL_NSIRUNNABLE
|
|
|
|
ProgressRunnable(FileHelper* aFileHelper,
|
|
uint64_t aProgress,
|
|
uint64_t aProgressMax)
|
|
: mFileHelper(aFileHelper),
|
|
mProgress(aProgress),
|
|
mProgressMax(aProgressMax)
|
|
{
|
|
}
|
|
|
|
private:
|
|
~ProgressRunnable() {}
|
|
|
|
nsRefPtr<FileHelper> mFileHelper;
|
|
uint64_t mProgress;
|
|
uint64_t mProgressMax;
|
|
};
|
|
|
|
class CloseRunnable final : public nsIRunnable
|
|
{
|
|
public:
|
|
NS_DECL_THREADSAFE_ISUPPORTS
|
|
NS_DECL_NSIRUNNABLE
|
|
|
|
explicit CloseRunnable(FileHelper* aFileHelper)
|
|
: mFileHelper(aFileHelper)
|
|
{ }
|
|
|
|
private:
|
|
~CloseRunnable() {}
|
|
|
|
nsRefPtr<FileHelper> mFileHelper;
|
|
};
|
|
|
|
class DestroyRunnable final : public nsIRunnable
|
|
{
|
|
public:
|
|
NS_DECL_THREADSAFE_ISUPPORTS
|
|
NS_DECL_NSIRUNNABLE
|
|
|
|
explicit DestroyRunnable(FileHelper* aFileHelper)
|
|
: mFileHelper(aFileHelper)
|
|
{ }
|
|
|
|
private:
|
|
~DestroyRunnable() {}
|
|
|
|
nsRefPtr<FileHelper> mFileHelper;
|
|
};
|
|
|
|
} // namespace
|
|
|
|
FileStreamWrapper::FileStreamWrapper(nsISupports* aFileStream,
|
|
FileHelper* aFileHelper,
|
|
uint64_t aOffset,
|
|
uint64_t aLimit,
|
|
uint32_t aFlags)
|
|
: mFileStream(aFileStream),
|
|
mFileHelper(aFileHelper),
|
|
mOffset(aOffset),
|
|
mLimit(aLimit),
|
|
mFlags(aFlags),
|
|
mFirstTime(true)
|
|
{
|
|
NS_ASSERTION(mFileStream, "Must have a file stream!");
|
|
NS_ASSERTION(mFileHelper, "Must have a file helper!");
|
|
}
|
|
|
|
FileStreamWrapper::~FileStreamWrapper()
|
|
{
|
|
if (mFlags & NOTIFY_DESTROY) {
|
|
if (NS_IsMainThread()) {
|
|
mFileHelper->OnStreamDestroy();
|
|
}
|
|
else {
|
|
nsCOMPtr<nsIRunnable> runnable =
|
|
new DestroyRunnable(mFileHelper);
|
|
|
|
nsresult rv = NS_DispatchToMainThread(runnable);
|
|
if (NS_FAILED(rv)) {
|
|
NS_WARNING("Failed to dispatch to the main thread!");
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
NS_IMPL_ISUPPORTS0(FileStreamWrapper)
|
|
|
|
FileInputStreamWrapper::FileInputStreamWrapper(nsISupports* aFileStream,
|
|
FileHelper* aFileHelper,
|
|
uint64_t aOffset,
|
|
uint64_t aLimit,
|
|
uint32_t aFlags)
|
|
: FileStreamWrapper(aFileStream, aFileHelper, aOffset, aLimit, aFlags)
|
|
{
|
|
mInputStream = do_QueryInterface(mFileStream);
|
|
NS_ASSERTION(mInputStream, "This should always succeed!");
|
|
}
|
|
|
|
NS_IMPL_ISUPPORTS_INHERITED(FileInputStreamWrapper,
|
|
FileStreamWrapper,
|
|
nsIInputStream,
|
|
nsIIPCSerializableInputStream)
|
|
|
|
NS_IMETHODIMP
|
|
FileInputStreamWrapper::Close()
|
|
{
|
|
NS_ASSERTION(!NS_IsMainThread(), "Wrong thread!");
|
|
|
|
if (mFlags & NOTIFY_CLOSE) {
|
|
nsCOMPtr<nsIRunnable> runnable = new CloseRunnable(mFileHelper);
|
|
|
|
if (NS_FAILED(NS_DispatchToMainThread(runnable))) {
|
|
NS_WARNING("Failed to dispatch to the main thread!");
|
|
}
|
|
}
|
|
|
|
mOffset = 0;
|
|
mLimit = 0;
|
|
|
|
return NS_OK;
|
|
}
|
|
|
|
NS_IMETHODIMP
|
|
FileInputStreamWrapper::Available(uint64_t* _retval)
|
|
{
|
|
// Performing sync IO on the main thread is generally not allowed.
|
|
// However, the input stream wrapper is also used to track reads performed by
|
|
// other APIs like FileReader, XHR, etc.
|
|
// In that case nsInputStreamChannel::OpenContentStream() calls Available()
|
|
// before setting the content length property. This property is not important
|
|
// to perform reads properly, so we can just return NS_BASE_STREAM_CLOSED
|
|
// here. It causes OpenContentStream() to set the content length property to
|
|
// zero.
|
|
|
|
if (NS_IsMainThread()) {
|
|
return NS_BASE_STREAM_CLOSED;
|
|
}
|
|
|
|
return mInputStream->Available(_retval);
|
|
}
|
|
|
|
NS_IMETHODIMP
|
|
FileInputStreamWrapper::Read(char* aBuf, uint32_t aCount, uint32_t* _retval)
|
|
{
|
|
NS_ASSERTION(!NS_IsMainThread(), "Wrong thread!");
|
|
|
|
nsresult rv;
|
|
|
|
if (mFirstTime) {
|
|
mFirstTime = false;
|
|
|
|
if (mOffset != UINT64_MAX) {
|
|
nsCOMPtr<nsISeekableStream> seekable = do_QueryInterface(mInputStream);
|
|
if (seekable) {
|
|
rv = seekable->Seek(nsISeekableStream::NS_SEEK_SET, mOffset);
|
|
NS_ENSURE_SUCCESS(rv, rv);
|
|
}
|
|
}
|
|
|
|
mOffset = 0;
|
|
}
|
|
|
|
uint64_t max = mLimit - mOffset;
|
|
if (max == 0) {
|
|
*_retval = 0;
|
|
return NS_OK;
|
|
}
|
|
|
|
if (aCount > max) {
|
|
aCount = max;
|
|
}
|
|
|
|
rv = mInputStream->Read(aBuf, aCount, _retval);
|
|
NS_ENSURE_SUCCESS(rv, rv);
|
|
|
|
mOffset += *_retval;
|
|
|
|
if (mFlags & NOTIFY_PROGRESS) {
|
|
nsCOMPtr<nsIRunnable> runnable =
|
|
new ProgressRunnable(mFileHelper, mOffset, mLimit);
|
|
|
|
rv = NS_DispatchToMainThread(runnable);
|
|
if (NS_FAILED(rv)) {
|
|
NS_WARNING("Failed to dispatch to the main thread!");
|
|
}
|
|
}
|
|
|
|
return NS_OK;
|
|
}
|
|
|
|
NS_IMETHODIMP
|
|
FileInputStreamWrapper::ReadSegments(nsWriteSegmentFun aWriter, void* aClosure,
|
|
uint32_t aCount, uint32_t* _retval)
|
|
{
|
|
return NS_ERROR_NOT_IMPLEMENTED;
|
|
}
|
|
|
|
NS_IMETHODIMP
|
|
FileInputStreamWrapper::IsNonBlocking(bool* _retval)
|
|
{
|
|
*_retval = false;
|
|
return NS_OK;
|
|
}
|
|
|
|
void
|
|
FileInputStreamWrapper::Serialize(InputStreamParams& aParams,
|
|
FileDescriptorArray& /* aFDs */)
|
|
{
|
|
MOZ_ASSERT(XRE_GetProcessType() == GeckoProcessType_Default);
|
|
MOZ_ASSERT(NS_IsMainThread());
|
|
|
|
nsCOMPtr<nsIInputStream> thisStream = do_QueryObject(this);
|
|
|
|
aParams = mozilla::ipc::SameProcessInputStreamParams(
|
|
reinterpret_cast<intptr_t>(thisStream.forget().take()));
|
|
}
|
|
|
|
bool
|
|
FileInputStreamWrapper::Deserialize(const InputStreamParams& /* aParams */,
|
|
const FileDescriptorArray& /* aFDs */)
|
|
{
|
|
MOZ_CRASH("Should never get here!");
|
|
}
|
|
|
|
FileOutputStreamWrapper::FileOutputStreamWrapper(nsISupports* aFileStream,
|
|
FileHelper* aFileHelper,
|
|
uint64_t aOffset,
|
|
uint64_t aLimit,
|
|
uint32_t aFlags)
|
|
: FileStreamWrapper(aFileStream, aFileHelper, aOffset, aLimit, aFlags)
|
|
{
|
|
mOutputStream = do_QueryInterface(mFileStream);
|
|
NS_ASSERTION(mOutputStream, "This should always succeed!");
|
|
}
|
|
|
|
NS_IMPL_ISUPPORTS_INHERITED(FileOutputStreamWrapper,
|
|
FileStreamWrapper,
|
|
nsIOutputStream)
|
|
|
|
NS_IMETHODIMP
|
|
FileOutputStreamWrapper::Close()
|
|
{
|
|
NS_ASSERTION(!NS_IsMainThread(), "Wrong thread!");
|
|
|
|
nsresult rv = NS_OK;
|
|
|
|
if (mFlags & NOTIFY_CLOSE) {
|
|
nsCOMPtr<nsIRunnable> runnable = new CloseRunnable(mFileHelper);
|
|
|
|
if (NS_FAILED(NS_DispatchToMainThread(runnable))) {
|
|
NS_WARNING("Failed to dispatch to the main thread!");
|
|
}
|
|
}
|
|
|
|
mOffset = 0;
|
|
mLimit = 0;
|
|
|
|
return rv;
|
|
}
|
|
|
|
NS_IMETHODIMP
|
|
FileOutputStreamWrapper::Write(const char* aBuf, uint32_t aCount,
|
|
uint32_t* _retval)
|
|
{
|
|
NS_ASSERTION(!NS_IsMainThread(), "Wrong thread!");
|
|
|
|
nsresult rv;
|
|
|
|
if (mFirstTime) {
|
|
mFirstTime = false;
|
|
|
|
nsCOMPtr<nsISeekableStream> seekable = do_QueryInterface(mOutputStream);
|
|
if (seekable) {
|
|
if (mOffset == UINT64_MAX) {
|
|
rv = seekable->Seek(nsISeekableStream::NS_SEEK_END, 0);
|
|
}
|
|
else {
|
|
rv = seekable->Seek(nsISeekableStream::NS_SEEK_SET, mOffset);
|
|
}
|
|
NS_ENSURE_SUCCESS(rv, rv);
|
|
}
|
|
|
|
mOffset = 0;
|
|
}
|
|
|
|
uint64_t max = mLimit - mOffset;
|
|
if (max == 0) {
|
|
*_retval = 0;
|
|
return NS_OK;
|
|
}
|
|
|
|
if (aCount > max) {
|
|
aCount = max;
|
|
}
|
|
|
|
rv = mOutputStream->Write(aBuf, aCount, _retval);
|
|
NS_ENSURE_SUCCESS(rv, rv);
|
|
|
|
mOffset += *_retval;
|
|
|
|
if (mFlags & NOTIFY_PROGRESS) {
|
|
nsCOMPtr<nsIRunnable> runnable =
|
|
new ProgressRunnable(mFileHelper, mOffset, mLimit);
|
|
|
|
NS_DispatchToMainThread(runnable);
|
|
}
|
|
|
|
return NS_OK;
|
|
}
|
|
|
|
NS_IMETHODIMP
|
|
FileOutputStreamWrapper::Flush()
|
|
{
|
|
return NS_OK;
|
|
}
|
|
|
|
NS_IMETHODIMP
|
|
FileOutputStreamWrapper::WriteFrom(nsIInputStream* aFromStream,
|
|
uint32_t aCount, uint32_t* _retval)
|
|
{
|
|
return NS_ERROR_NOT_IMPLEMENTED;
|
|
}
|
|
|
|
NS_IMETHODIMP
|
|
FileOutputStreamWrapper::WriteSegments(nsReadSegmentFun aReader,
|
|
void* aClosure, uint32_t aCount,
|
|
uint32_t* _retval)
|
|
{
|
|
return NS_ERROR_NOT_IMPLEMENTED;
|
|
}
|
|
|
|
NS_IMETHODIMP
|
|
FileOutputStreamWrapper::IsNonBlocking(bool* _retval)
|
|
{
|
|
*_retval = false;
|
|
return NS_OK;
|
|
}
|
|
|
|
NS_IMPL_ISUPPORTS(ProgressRunnable, nsIRunnable)
|
|
|
|
NS_IMETHODIMP
|
|
ProgressRunnable::Run()
|
|
{
|
|
NS_ASSERTION(NS_IsMainThread(), "Wrong thread!");
|
|
|
|
mFileHelper->OnStreamProgress(mProgress, mProgressMax);
|
|
mFileHelper = nullptr;
|
|
|
|
return NS_OK;
|
|
}
|
|
|
|
NS_IMPL_ISUPPORTS(CloseRunnable, nsIRunnable)
|
|
|
|
NS_IMETHODIMP
|
|
CloseRunnable::Run()
|
|
{
|
|
NS_ASSERTION(NS_IsMainThread(), "Wrong thread!");
|
|
|
|
mFileHelper->OnStreamClose();
|
|
mFileHelper = nullptr;
|
|
|
|
return NS_OK;
|
|
}
|
|
|
|
NS_IMPL_ISUPPORTS(DestroyRunnable, nsIRunnable)
|
|
|
|
NS_IMETHODIMP
|
|
DestroyRunnable::Run()
|
|
{
|
|
NS_ASSERTION(NS_IsMainThread(), "Wrong thread!");
|
|
|
|
mFileHelper->OnStreamDestroy();
|
|
mFileHelper = nullptr;
|
|
|
|
return NS_OK;
|
|
}
|
|
|
|
} // namespace dom
|
|
} // namespace mozilla
|