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

Prevent double submission of forms (bug 72906). r=darin@netscape.com, r=alexsavulov@netscape.com, sr=alecf@netscape.com, a=asa

Browse Source
This commit is contained in:
jkeiser@netscape.com
2002-03-13 06:08:56 +00:00
parent b1686866bf
commit 2e0703757a
11 changed files with 309 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
docshell/base/nsDocShell.cpp
View File

@@ -648,7 +648,9 @@ nsDocShell::LoadURI(nsIURI * aURI,
nsnull, // No headers stream
loadType,
nsnull, // No SHEntry
firstParty);
firstParty,
nsnull, // No nsIDocShell
nsnull); // No nsIRequest
}
return rv;
@@ -2417,8 +2419,10 @@ nsDocShell::Reload(PRUint32 aReloadFlags)
nsnull, // No post data
nsnull, // No headers data
type, // Load type
nsnull, // No SHEntry
PR_TRUE);
nsnull, // No SHEntry
PR_TRUE,
nsnull, // No nsIDocShell
nsnull); // No nsIRequest
return rv;
}
@@ -4285,9 +4289,19 @@ nsDocShell::InternalLoad(nsIURI * aURI,
nsIInputStream * aHeadersData,
PRUint32 aLoadType,
nsISHEntry * aSHEntry,
PRBool firstParty)
PRBool firstParty,
nsIDocShell** aDocShell,
nsIRequest** aRequest)
{
nsresult rv;
nsresult rv = NS_OK;
// Initialize aDocShell/aRequest
if (aDocShell) {
*aDocShell = nsnull;
}
if (aRequest) {
*aRequest = nsnull;
}
nsCOMPtr<nsISupports> owner(aOwner);
//
@@ -4334,8 +4348,9 @@ nsDocShell::InternalLoad(nsIURI * aURI,
extProtService->ExternalProtocolHandlerExists(urlScheme.get(),
&haveHandler);
if (haveHandler)
if (haveHandler) {
return extProtService->LoadUrl(aURI);
}
}
}
}
@@ -4397,7 +4412,9 @@ nsDocShell::InternalLoad(nsIURI * aURI,
aHeadersData,
aLoadType,
aSHEntry,
firstParty);
firstParty,
aDocShell,
aRequest);
if (rv == NS_ERROR_NO_CONTENT) {
if (bIsNewWindow) {
//
@@ -4512,7 +4529,8 @@ nsDocShell::InternalLoad(nsIURI * aURI,
// been called.
mLSHE = aSHEntry;
rv = DoURILoad(aURI, aReferrer, owner, aPostData, aHeadersData, firstParty);
rv = DoURILoad(aURI, aReferrer, owner, aPostData, aHeadersData, firstParty,
aDocShell, aRequest);
return rv;
}
@@ -4583,12 +4601,15 @@ nsDocShell::GetCurrentDocumentOwner(nsISupports ** aOwner)
return rv;
}
nsresult nsDocShell::DoURILoad(nsIURI * aURI,
nsIURI * aReferrerURI,
nsISupports * aOwner,
nsIInputStream * aPostData,
nsIInputStream * aHeadersData,
PRBool firstParty)
nsresult
nsDocShell::DoURILoad(nsIURI * aURI,
nsIURI * aReferrerURI,
nsISupports * aOwner,
nsIInputStream * aPostData,
nsIInputStream * aHeadersData,
PRBool firstParty,
nsIDocShell ** aDocShell,
nsIRequest ** aRequest)
{
nsresult rv;
nsCOMPtr<nsIURILoader> uriLoader;
@@ -4716,6 +4737,20 @@ nsresult nsDocShell::DoURILoad(nsIURI * aURI,
}
rv = DoChannelLoad(channel, uriLoader);
//
// If the channel load failed, we failed and nsIWebProgress just ain't
// gonna happen.
//
if (NS_SUCCEEDED(rv)) {
if (aDocShell) {
*aDocShell = this;
NS_ADDREF(*aDocShell);
}
if (aRequest) {
CallQueryInterface(channel, aRequest);
}
}
return rv;
}
@@ -5497,7 +5532,9 @@ nsDocShell::LoadHistoryEntry(nsISHEntry * aEntry, PRUint32 aLoadType)
nsnull, // No headers stream
aLoadType, // Load type
aEntry, // SHEntry
PR_TRUE);
PR_TRUE,
nsnull, // No nsIDocShell
nsnull); // No nsIRequest
return rv;
}