From 5a9a3f516c9713970244c4b26d6a32fdfd2395df Mon Sep 17 00:00:00 2001 From: Iulian Moraru Date: Tue, 20 Sep 2022 22:29:33 +0300 Subject: [PATCH] Backed out changeset a51561d5d7a9 (bug 1765132) for causing ThreadSanitizer data race failures on nsSocketTransport2.cpp. CLOSED TREE --- netwerk/base/nsSocketTransport2.cpp | 7 ------- netwerk/protocol/http/nsHttpTransaction.cpp | 4 ---- 2 files changed, 11 deletions(-) diff --git a/netwerk/base/nsSocketTransport2.cpp b/netwerk/base/nsSocketTransport2.cpp index 469be0cebf6c..fd927587322a 100644 --- a/netwerk/base/nsSocketTransport2.cpp +++ b/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; diff --git a/netwerk/protocol/http/nsHttpTransaction.cpp b/netwerk/protocol/http/nsHttpTransaction.cpp index cbe7fcfe8e73..65f4bbe593a4 100644 --- a/netwerk/protocol/http/nsHttpTransaction.cpp +++ b/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); }