Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-26 06:11:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixes bug 47617 "Connection to https needs to tell user to install PSM if w/o"

Browse Source 
r=gagan, sr=mscott
This commit is contained in:
darin%netscape.com 2001-12-11 23:01:08 +00:00
parent fb29f7f072
commit 00908ba8cf
2 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docshell/base/appstrings.properties
View File

@ -27,3 +27,4 @@ redirectLoop=Redirection limit for this URL exceeded. Loading aborted.
repost=The page you are trying to view contains POSTDATA that has expired from cache. If you resend the data, any action the form carried out (such as a search or online purchase) will be repeated. To resend the data, click OK. Otherwise, click Cancel. repost=The page you are trying to view contains POSTDATA that has expired from cache. If you resend the data, any action the form carried out (such as a search or online purchase) will be repeated. To resend the data, click OK. Otherwise, click Cancel.
repostConfirm=The page you are trying to view contains POSTDATA. If you resend the data, any action the form carried out (such as a search or online purchase) will be repeated. To resend the data, click OK. Otherwise, click Cancel. repostConfirm=The page you are trying to view contains POSTDATA. If you resend the data, any action the form carried out (such as a search or online purchase) will be repeated. To resend the data, click OK. Otherwise, click Cancel.
fileNotFound=%s does not exist or could not be accessed. Please check the file path and try again. fileNotFound=%s does not exist or could not be accessed. Please check the file path and try again.
unknownSocketType=Unknown socket type. Loading aborted.

18
docshell/base/nsWebShell.cpp
View File

@ -63,6 +63,7 @@ typedef unsigned long HMTX;
#include "nsNetUtil.h" #include "nsNetUtil.h"
#include "nsIProtocolHandler.h" #include "nsIProtocolHandler.h"
#include "nsIDNSService.h" #include "nsIDNSService.h"
#include "nsISocketProvider.h"
#include "nsIRefreshURI.h" #include "nsIRefreshURI.h"
#include "nsIScriptGlobalObject.h" #include "nsIScriptGlobalObject.h"
#include "nsIScriptGlobalObjectOwner.h" #include "nsIScriptGlobalObjectOwner.h"
@ -1236,6 +1237,23 @@ nsresult nsWebShell::EndPageLoad(nsIWebProgress *aProgress,
getter_Copies(messageStr)); getter_Copies(messageStr));
if (NS_FAILED(rv)) return rv; if (NS_FAILED(rv)) return rv;
prompter->Alert(nsnull, messageStr);
}
else if (aStatus == NS_ERROR_UNKNOWN_SOCKET_TYPE) {
nsCOMPtr<nsIPrompt> prompter;
nsCOMPtr<nsIStringBundle> stringBundle;
rv = GetPromptAndStringBundle(getter_AddRefs(prompter),
getter_AddRefs(stringBundle));
if (!stringBundle) {
return rv;
}
nsXPIDLString messageStr;
rv = stringBundle->GetStringFromName(NS_LITERAL_STRING("unknownSocketType").get(),
getter_Copies(messageStr));
if (NS_FAILED(rv)) return rv;
prompter->Alert(nsnull, messageStr); prompter->Alert(nsnull, messageStr);
} }
} // if we have a host } // if we have a host