commit 3286374f1570e4bb9d5f10a7c9ae83f5c9777540
Author: Georg Koppen <gk(a)torproject.org>
Date: Tue Dec 7 11:56:08 2021 +0000
Revert "Bug 40475: Include clearing CORS preflight cache"
This reverts commit 0695c7c0ee83a1ec69b198f50fe3b2ee2514154f.
Fixes: tor-browser#40475.
---
netwerk/protocol/http/nsCORSListenerProxy.cpp | 7 -------
netwerk/protocol/http/nsCORSListenerProxy.h | 1 -
netwerk/protocol/http/nsHttpHandler.cpp | 1 -
3 files changed, 9 deletions(-)
diff --git a/netwerk/protocol/http/nsCORSListenerProxy.cpp b/netwerk/protocol/http/nsCORSListenerProxy.cpp
index 9ece2020bc7d..1de4e2abed4a 100644
--- a/netwerk/protocol/http/nsCORSListenerProxy.cpp
+++ b/netwerk/protocol/http/nsCORSListenerProxy.cpp
@@ -358,13 +358,6 @@ void nsCORSListenerProxy::ClearCache() {
sPreflightCache->Clear();
}
-/* static */
-void nsCORSListenerProxy::Clear() {
- if (sPreflightCache) {
- sPreflightCache->Clear();
- }
-}
-
nsCORSListenerProxy::nsCORSListenerProxy(nsIStreamListener* aOuter,
nsIPrincipal* aRequestingPrincipal,
bool aWithCredentials)
diff --git a/netwerk/protocol/http/nsCORSListenerProxy.h b/netwerk/protocol/http/nsCORSListenerProxy.h
index 5b858223028f..e3f1ff27f1d1 100644
--- a/netwerk/protocol/http/nsCORSListenerProxy.h
+++ b/netwerk/protocol/http/nsCORSListenerProxy.h
@@ -59,7 +59,6 @@ class nsCORSListenerProxy final : public nsIStreamListener,
static void Shutdown();
static void ClearCache();
- static void Clear();
[[nodiscard]] nsresult Init(nsIChannel* aChannel,
DataURIHandling aAllowDataURI);
diff --git a/netwerk/protocol/http/nsHttpHandler.cpp b/netwerk/protocol/http/nsHttpHandler.cpp
index 5925c4598bc1..0bb944164652 100644
--- a/netwerk/protocol/http/nsHttpHandler.cpp
+++ b/netwerk/protocol/http/nsHttpHandler.cpp
@@ -2167,7 +2167,6 @@ nsHttpHandler::Observe(nsISupports* subject, const char* topic,
if (mAltSvcCache) {
mAltSvcCache->ClearAltServiceMappings();
}
- nsCORSListenerProxy::Clear();
} else if (!strcmp(topic, NS_NETWORK_LINK_TOPIC)) {
nsAutoCString converted = NS_ConvertUTF16toUTF8(data);
if (!strcmp(converted.get(), NS_NETWORK_LINK_DATA_CHANGED)) {