Backed out changeset 9ad2c5fa9f3b (bug 1883626) for causing Bug 18845…

…78 CLOSED TREE
dothq · Mar 13, 2024 · 50eb644 · 50eb644
1 parent 6169ac5
commit 50eb644
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 12 deletions.
diff --git a/modules/libpref/init/StaticPrefList.yaml b/modules/libpref/init/StaticPrefList.yaml
@@ -11569,15 +11569,6 @@
   value: true
   mirror: always
 
-# When true, HttpChannelParent::SendRedirectFailed might race against
-# HttpChannelParent::Delete when completing a redirect.
-# This exists only to prevent unexpected regressions.
-# It should be removed in a few releases.
-- name: network.http.redirect.raceDeletion
-  type: RelaxedAtomicBool
-  value: false
-  mirror: always
-
 # Prefs allowing granular control of referers.
 # 0=don't send any, 1=send only on clicks, 2=send on image requests as well
 - name: network.http.sendRefererHeader

diff --git a/netwerk/protocol/http/HttpChannelParent.cpp b/netwerk/protocol/http/HttpChannelParent.cpp
@@ -26,7 +26,6 @@
 #include "mozilla/Preferences.h"
 #include "mozilla/ProfilerLabels.h"
 #include "mozilla/ProfilerMarkers.h"
-#include "mozilla/StaticPrefs_network.h"
 #include "mozilla/StoragePrincipalHelper.h"
 #include "mozilla/UniquePtr.h"
 #include "mozilla/Unused.h"
@@ -2122,8 +2121,7 @@ HttpChannelParent::OnRedirectResult(nsresult status) {
       mParentListener->SetListenerAfterRedirect(redirectChannel);
       redirectChannel->SetParentListener(mParentListener);
     }
-  } else if (redirectChannel &&
-             StaticPrefs::network_http_redirect_raceDeletion()) {
+  } else if (redirectChannel) {
     // Delete the redirect target channel: continue using old channel
     redirectChannel->Delete();
   }