Backout 3bcd9a5a33a2 (bug 814247), d9546d42054c & 8b6edf9f6b87 (bug 814638) for failures in test_bug814638.xul and also crashes on a CLOSED TREE

This commit is contained in:
Ed Morley
2012-12-19 23:46:07 +00:00
parent 092768a620
commit 859dd33a28
14 changed files with 31 additions and 441 deletions

View File

@@ -2771,16 +2771,12 @@ _getauthenticationinfo(NPP instance, const char *protocol, const char *host,
bool authPrivate = false;
GetPrivacyFromNPP(instance, &authPrivate);
nsIDocument *doc = GetDocumentFromNPP(instance);
NS_ENSURE_TRUE(doc, NPERR_GENERIC_ERROR);
nsIPrincipal *principal = doc->NodePrincipal();
nsAutoString unused, uname16, pwd16;
if (NS_FAILED(authManager->GetAuthIdentity(proto, nsDependentCString(host),
port, nsDependentCString(scheme),
nsDependentCString(realm),
EmptyCString(), unused, uname16,
pwd16, authPrivate, principal))) {
pwd16, authPrivate))) {
return NPERR_GENERIC_ERROR;
}