Skip to content

Commit

Permalink
remove locale workaround for #590, people have had long enough
Browse files Browse the repository at this point in the history
  • Loading branch information
classilla committed Aug 25, 2020
1 parent f37f6f5 commit da10af1
Showing 1 changed file with 1 addition and 8 deletions.
9 changes: 1 addition & 8 deletions uriloader/base/nsDocLoader.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down

0 comments on commit da10af1

Please sign in to comment.