corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge backout.

Browse Source
This commit is contained in:
Mounir Lamouri
2010-09-30 16:49:56 -07:00
parent a66079178c 3f25269c96
commit 73722e46d0
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
docshell/base/nsDocShell.cpp
View File

@@ -5890,7 +5890,7 @@ nsDocShell::OnRedirectStateChange(nsIChannel* aOldChannel,
}
// HTTP channel with unsafe methods should not be redirected to a cross-domain.
if (!ChannelIsSafeHTTPMethod(aNewChannel)) {
if (!ChannelIsSafeMethod(aNewChannel)) {
// This code is very similar to the code of nsSameOriginChecker in
// nsContentUtils but we can't use nsSameOriginChecker because it
// needs to use a channel callback (which we already use).
@@ -8789,7 +8789,7 @@ nsDocShell::DoURILoad(nsIURI * aURI,
// If a specific HTTP channel has been set and it is not a safe method,
// we should prevent cross-origin requests.
if (aHttpMethod && ownerPrincipal && !ChannelIsSafeHTTPMethod(channel)) {
if (aHttpMethod && ownerPrincipal && !ChannelIsSafeMethod(channel)) {
if (NS_FAILED(ownerPrincipal->CheckMayLoad(aURI, PR_FALSE))) {
return NS_OK;
}
@@ -10436,11 +10436,11 @@ nsDocShell::ChannelIsPost(nsIChannel* aChannel)
/* static */
bool
nsDocShell::ChannelIsSafeHTTPMethod(nsIChannel* aChannel)
nsDocShell::ChannelIsSafeMethod(nsIChannel* aChannel)
{
nsCOMPtr<nsIHttpChannel> httpChannel(do_QueryInterface(aChannel));
if (!httpChannel) {
return true;
return false;
}
nsCAutoString method;