Backed out changeset 4198b9d273b9 (bug 1399541) for causing bug 1399899.
authorRyan VanderMeulen <ryanvm@gmail.com>
Thu, 14 Sep 2017 12:13:38 -0400
changeset 430351 943c2c2a1daf5cd0d3287c1974eb510615d5ed5b
parent 430350 ef0f1085d54eae99d62bbf039952b0deb84f396d
child 430352 aa0877abb872e6137679944053932281d748ac34
child 430416 e3a8671c18c208504bb0ad10544f9184d78253f3
child 430469 5eef4a7618457f27848d5fbcf203470b5065f607
push id7761
push userjlund@mozilla.com
push dateFri, 15 Sep 2017 00:19:52 +0000
treeherdermozilla-beta@c38455951db4 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1399541, 1399899
milestone57.0a1
backs out4198b9d273b9db50b5ffe4cdd078da073d8483db
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Backed out changeset 4198b9d273b9 (bug 1399541) for causing bug 1399899.
netwerk/protocol/http/nsHttpChannel.cpp
--- a/netwerk/protocol/http/nsHttpChannel.cpp
+++ b/netwerk/protocol/http/nsHttpChannel.cpp
@@ -3972,30 +3972,26 @@ nsHttpChannel::OpenCacheEntry(bool isHtt
             MaybeRaceCacheWithNetwork();
         }
 
         if (!mCacheOpenDelay) {
             MOZ_ASSERT(NS_IsMainThread(), "Should be called on the main thread");
             mCacheAsyncOpenCalled = true;
             if (mNetworkTriggered) {
                 mRaceCacheWithNetwork = true;
-                MOZ_RELEASE_ASSERT(sRCWNEnabled, "Racing should be enabled");
             }
             rv = cacheStorage->AsyncOpenURI(openURI, extension, cacheEntryOpenFlags, this);
         } else {
             // We pass `this` explicitly as a parameter due to the raw pointer
             // to refcounted object in lambda analysis.
             mCacheOpenFunc = [openURI, extension, cacheEntryOpenFlags, cacheStorage] (nsHttpChannel* self) -> void {
                 MOZ_ASSERT(NS_IsMainThread(), "Should be called on the main thread");
                 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);
             };
 
             mCacheOpenTimer = do_CreateInstance(NS_TIMER_CONTRACTID);
             // calls nsHttpChannel::Notify after `mCacheOpenDelay` milliseconds
             mCacheOpenTimer->InitWithCallback(this, mCacheOpenDelay, nsITimer::TYPE_ONE_SHOT);
 
@@ -9387,17 +9383,16 @@ nsHttpChannel::TriggerNetwork()
     if (mProxyRequest) {
         LOG(("  proxy request in progress. Delaying network trigger.\n"));
         mWaitingForProxy = true;
         return NS_OK;
     }
 
     if (mCacheAsyncOpenCalled && !mOnCacheAvailableCalled) {
         mRaceCacheWithNetwork = true;
-        MOZ_RELEASE_ASSERT(sRCWNEnabled, "Racing should be enabled");
     }
 
     LOG(("  triggering network\n"));
     return TryHSTSPriming();
 }
 
 nsresult
 nsHttpChannel::MaybeRaceCacheWithNetwork()