Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-16 23:05:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge m-c to inbound. a=merge

Browse Source
This commit is contained in:
Ryan VanderMeulen 2017-09-14 12:14:36 -04:00
commit c6a1bbca85
1 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
netwerk/protocol/http/nsHttpChannel.cpp
View File

@ -3986,7 +3986,6 @@ nsHttpChannel::OpenCacheEntry(bool isHttps)
mCacheAsyncOpenCalled = true;
if (mNetworkTriggered) {
mRaceCacheWithNetwork = true;
MOZ_RELEASE_ASSERT(sRCWNEnabled, "Racing should be enabled");
}
rv = cacheStorage->AsyncOpenURI(openURI, extension, cacheEntryOpenFlags, this);
} else {
@ -3997,9 +3996,6 @@ nsHttpChannel::OpenCacheEntry(bool isHttps)
self->mCacheAsyncOpenCalled = true;
if (self->mNetworkTriggered) {
self->mRaceCacheWithNetwork = true;
// This is only done in xpcshell-test to simulate a slow
// opening of the cache, so we don't need to assert that
// sRCWNEnabled == true
}
cacheStorage->AsyncOpenURI(openURI, extension, cacheEntryOpenFlags, self);
};
@ -9401,7 +9397,6 @@ nsHttpChannel::TriggerNetwork()
if (mCacheAsyncOpenCalled && !mOnCacheAvailableCalled) {
mRaceCacheWithNetwork = true;
MOZ_RELEASE_ASSERT(sRCWNEnabled, "Racing should be enabled");
}
LOG((" triggering network\n"));