Backed out changeset a51561d5d7a9 (bug 1765132) for causing ThreadSanitizer data race failures on nsSocketTransport2.cpp. CLOSED TREE

netwerk/base/nsSocketTransport2.cpp

@@ -2390,13 +2390,6 @@ nsSocketTransport::Close(nsresult reason) {
 
   mDoNotRetryToConnect = true;
 
-  if (mCondition == NS_ERROR_NET_RESET && mDNSRecord &&
-      mOutput.ByteCount() == 0) {
-    // If we are here, it's likely that we are retrying a transaction. Blocking
-    // the already used address could increase the successful rate of the retry.
-    mDNSRecord->ReportUnusable(SocketPort());
-  }
-
   mInput.CloseWithStatus(reason);
   mOutput.CloseWithStatus(reason);
   return NS_OK;

netwerk/protocol/http/nsHttpTransaction.cpp

@@ -1794,10 +1794,6 @@ nsresult nsHttpTransaction::Restart() {
   // Use TRANSACTION_RESTART_OTHERS as a catch-all.
   SetRestartReason(TRANSACTION_RESTART_OTHERS);
 
-  // Reset the IP family preferences, so the new connection can try to use
-  // another IPv4 or IPv6 address.
-  gHttpHandler->ConnMgr()->ResetIPFamilyPreference(mConnInfo);
-
   return gHttpHandler->InitiateTransaction(this, mPriority);
 }