From da10af1b07ad39dd1e33d07a47a6c49815e40437 Mon Sep 17 00:00:00 2001
From: Cameron Kaiser <classilla@floodgap.com>
Date: Mon, 24 Aug 2020 21:21:20 -0700
Subject: [PATCH] remove locale workaround for #590, people have had long
 enough

---
 uriloader/base/nsDocLoader.cpp | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/uriloader/base/nsDocLoader.cpp b/uriloader/base/nsDocLoader.cpp
index 8059e0155..4adc3960e 100644
--- a/uriloader/base/nsDocLoader.cpp
+++ b/uriloader/base/nsDocLoader.cpp
@@ -1090,14 +1090,7 @@ NS_IMETHODIMP nsDocLoader::OnStatus(nsIRequest* aRequest, nsISupports* ctxt,
     if (!sbs)
       return NS_ERROR_FAILURE;
     nsXPIDLString msg;
-    /* TenFourFox issue 590. Map NS_NET_STATUS_TLS_HANDSHAKE_STARTING and
-       NS_NET_STATUS_TLS_HANDSHAKE_ENDED to NS_NET_STATUS_CONNECTED_TO so
-       that we don't instantly invalidate all our locales. See also
-       netwerk/locales/en-US/necko.properties XXX */
-    nsresult rv = sbs->FormatStatusMessage(
-    (aStatus == NS_NET_STATUS_TLS_HANDSHAKE_STARTING ||
-     aStatus == NS_NET_STATUS_TLS_HANDSHAKE_ENDED) ?
-     NS_NET_STATUS_CONNECTED_TO : aStatus,
+    nsresult rv = sbs->FormatStatusMessage(aStatus,
                                            aStatusArg,
                                            getter_Copies(msg));
     if (NS_FAILED(rv))