Backed out changeset 27196ff54fd7 (bug 1565242) for failing an assertion on nsHttpConnectionMgr.cpp CLOSED TREE
authorBogdan Tara <btara@mozilla.com>
Tue, 16 Jul 2019 23:20:15 +0300
changeset 483021 bbfdc264f3e0ec3b5a6a19760fdb7bb7a82b8c94
parent 483020 b1a964205023bdb3ef2f7cc11b912eca7da0c5a7
child 483022 5fc0040acb2a646aee6844e27796616101e466a7
push id90137
push userbtara@mozilla.com
push dateTue, 16 Jul 2019 20:21:57 +0000
treeherderautoland@bbfdc264f3e0 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1565242
milestone70.0a1
backs out27196ff54fd7f5de390397be35b8acdeb0509fa4
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 27196ff54fd7 (bug 1565242) for failing an assertion on nsHttpConnectionMgr.cpp CLOSED TREE
netwerk/protocol/http/nsHttpConnectionMgr.cpp
--- a/netwerk/protocol/http/nsHttpConnectionMgr.cpp
+++ b/netwerk/protocol/http/nsHttpConnectionMgr.cpp
@@ -2829,35 +2829,16 @@ void nsHttpConnectionMgr::OnMsgReclaimCo
   // therefore not something that should be reused.
   if (conn->Transaction()) {
     conn->DontReuse();
   }
 
   if (ent->mActiveConns.RemoveElement(conn)) {
     DecrementActiveConnCount(conn);
     ConditionallyStopTimeoutTick();
-  } else if (conn->EverUsedSpdy()) {
-    LOG(("nsHttpConnection %p not found in its connection entry, try ^anon",
-         conn));
-    // repeat for flipped anon flag as we share connection entries for spdy
-    // connections.
-    RefPtr<nsHttpConnectionInfo> anonInvertedCI(ci->Clone());
-    anonInvertedCI->SetAnonymous(!ci->GetAnonymous());
-
-    nsConnectionEntry* ent = mCT.GetWeak(anonInvertedCI->HashKey());
-    if (ent && ent->mActiveConns.RemoveElement(conn)) {
-      DecrementActiveConnCount(conn);
-      ConditionallyStopTimeoutTick();
-    } else {
-      LOG(
-          ("nsHttpConnection %p could not be removed from its entry's active "
-           "list",
-           conn));
-      MOZ_ASSERT(false, "Active connection not found");
-    }
   }
 
   if (conn->CanReuse()) {
     LOG(("  adding connection to idle list\n"));
     // Keep The idle connection list sorted with the connections that
     // have moved the largest data pipelines at the front because these
     // connections have the largest cwnds on the server.