corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1038756: Callsites creating a channel in /uriloader/ (r=honzab)

Browse Source
This commit is contained in:
Christoph Kerschbaumer
2014-09-21 09:44:12 -07:00
parent 5d33c83ba0
commit f6c907550f
2 changed files with 23 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
uriloader/prefetch/nsOfflineCacheUpdate.cpp
View File

@@ -40,6 +40,7 @@
#include "nsIAsyncVerifyRedirectCallback.h" #include "nsIAsyncVerifyRedirectCallback.h"
#include "mozilla/Preferences.h" #include "mozilla/Preferences.h"
#include "mozilla/Attributes.h" #include "mozilla/Attributes.h"
#include "nsContentUtils.h"
#include "nsXULAppAPI.h" #include "nsXULAppAPI.h"
@@ -179,11 +180,16 @@ nsManifestCheck::Begin()
rv = mManifestHash->Init(nsICryptoHash::MD5); rv = mManifestHash->Init(nsICryptoHash::MD5);
NS_ENSURE_SUCCESS(rv, rv); NS_ENSURE_SUCCESS(rv, rv);
rv = NS_NewChannel(getter_AddRefs(mChannel), rv = NS_NewChannel(getter_AddRefs(mChannel),
mURI, mURI,
nullptr, nullptr, nullptr, nsContentUtils::GetSystemPrincipal(),
nsILoadInfo::SEC_NORMAL,
nsIContentPolicy::TYPE_OTHER,
nullptr, // aChannelPolicy
nullptr, // loadGroup
nullptr, // aCallbacks
nsIRequest::LOAD_BYPASS_CACHE); nsIRequest::LOAD_BYPASS_CACHE);
NS_ENSURE_SUCCESS(rv, rv); NS_ENSURE_SUCCESS(rv, rv);
// configure HTTP specific stuff // configure HTTP specific stuff
@@ -374,8 +380,14 @@ nsOfflineCacheUpdateItem::OpenChannel(nsOfflineCacheUpdate *aUpdate)
rv = NS_NewChannel(getter_AddRefs(mChannel), rv = NS_NewChannel(getter_AddRefs(mChannel),
mURI, mURI,
nullptr, nullptr, this, nsContentUtils::GetSystemPrincipal(),
nsILoadInfo::SEC_NORMAL,
nsIContentPolicy::TYPE_OTHER,
nullptr, // aChannelPolicy
nullptr, // aLoadGroup
this, // aCallbacks
flags); flags);
NS_ENSURE_SUCCESS(rv, rv); NS_ENSURE_SUCCESS(rv, rv);
nsCOMPtr<nsIApplicationCacheChannel> appCacheChannel = nsCOMPtr<nsIApplicationCacheChannel> appCacheChannel =

9
uriloader/prefetch/nsPrefetchService.cpp
View File

@@ -28,6 +28,7 @@
#include "nsIDOMNode.h" #include "nsIDOMNode.h"
#include "nsINode.h" #include "nsINode.h"
#include "nsIDocument.h" #include "nsIDocument.h"
#include "nsContentUtils.h"
using namespace mozilla; using namespace mozilla;
@@ -188,9 +189,15 @@ nsPrefetchNode::OpenChannel()
nsCOMPtr<nsILoadGroup> loadGroup = source->OwnerDoc()->GetDocumentLoadGroup(); nsCOMPtr<nsILoadGroup> loadGroup = source->OwnerDoc()->GetDocumentLoadGroup();
nsresult rv = NS_NewChannel(getter_AddRefs(mChannel), nsresult rv = NS_NewChannel(getter_AddRefs(mChannel),
mURI, mURI,
nullptr, loadGroup, this, nsContentUtils::GetSystemPrincipal(),
nsILoadInfo::SEC_NORMAL,
nsIContentPolicy::TYPE_OTHER,
nullptr, // aChannelPolicy
loadGroup, // aLoadGroup
this, // aCallbacks
nsIRequest::LOAD_BACKGROUND | nsIRequest::LOAD_BACKGROUND |
nsICachingChannel::LOAD_ONLY_IF_MODIFIED); nsICachingChannel::LOAD_ONLY_IF_MODIFIED);
NS_ENSURE_SUCCESS(rv, rv); NS_ENSURE_SUCCESS(rv, rv);
// configure HTTP specific stuff // configure HTTP specific stuff