remove locale workaround for #590, people have had long enough
This commit is contained in:
parent
f37f6f5e8b
commit
da10af1b07
|
@ -1090,14 +1090,7 @@ NS_IMETHODIMP nsDocLoader::OnStatus(nsIRequest* aRequest, nsISupports* ctxt,
|
||||||
if (!sbs)
|
if (!sbs)
|
||||||
return NS_ERROR_FAILURE;
|
return NS_ERROR_FAILURE;
|
||||||
nsXPIDLString msg;
|
nsXPIDLString msg;
|
||||||
/* TenFourFox issue 590. Map NS_NET_STATUS_TLS_HANDSHAKE_STARTING and
|
nsresult rv = sbs->FormatStatusMessage(aStatus,
|
||||||
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,
|
|
||||||
aStatusArg,
|
aStatusArg,
|
||||||
getter_Copies(msg));
|
getter_Copies(msg));
|
||||||
if (NS_FAILED(rv))
|
if (NS_FAILED(rv))
|
||||||
|
|
Loading…
Reference in New Issue