зеркало из https://github.com/mozilla/pjs.git
Followup cleanup for bug 439034, remove dead code and some silly code too. r+sr=jonas@sicking.cc
This commit is contained in:
Родитель
ce4933e3cc
Коммит
6073b95a00
|
@ -254,29 +254,16 @@ nsXMLDocument::OnChannelRedirect(nsIChannel *aOldChannel,
|
|||
{
|
||||
NS_PRECONDITION(aNewChannel, "Redirecting to null channel?");
|
||||
|
||||
nsCOMPtr<nsIURI> newLocation;
|
||||
nsresult rv = aNewChannel->GetURI(getter_AddRefs(newLocation)); // The redirected URI
|
||||
if (NS_FAILED(rv))
|
||||
return rv;
|
||||
|
||||
nsIScriptSecurityManager *secMan = nsContentUtils::GetSecurityManager();
|
||||
|
||||
nsCOMPtr<nsIURI> oldURI;
|
||||
rv = aOldChannel->GetURI(getter_AddRefs(oldURI));
|
||||
nsresult rv = aOldChannel->GetURI(getter_AddRefs(oldURI));
|
||||
NS_ENSURE_SUCCESS(rv, rv);
|
||||
|
||||
nsCOMPtr<nsIURI> newURI;
|
||||
rv = aNewChannel->GetURI(getter_AddRefs(newURI));
|
||||
NS_ENSURE_SUCCESS(rv, rv);
|
||||
|
||||
rv = nsContentUtils::GetSecurityManager()->
|
||||
return nsContentUtils::GetSecurityManager()->
|
||||
CheckSameOriginURI(oldURI, newURI, PR_TRUE);
|
||||
|
||||
if (NS_FAILED(rv)) {
|
||||
return rv;
|
||||
}
|
||||
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
NS_IMETHODIMP
|
||||
|
|
Загрузка…
Ссылка в новой задаче