Bommels05/Mozilla
Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

force stream closure when for uploading (bug 121314; r=adamlock; sr=darin; a=shaver)

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@115312 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
brade%netscape.com 2002-02-25 18:47:47 +00:00
parent cf66fbb40b
commit 03fed263e0
2 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
mozilla/embedding/components/webbrowserpersist/src/nsWebBrowserPersist.cpp
View File

@ -426,14 +426,9 @@ NS_IMETHODIMP nsWebBrowserPersist::CancelSave()
nsresult
nsWebBrowserPersist::StartUpload(nsIOutputStream *aOutStream,
nsWebBrowserPersist::StartUpload(nsIStorageStream *storStream,
nsIURI *aDestinationURI, const char *aContentType)
{
// if we don't have the right type of output stream then it's probably a local file
nsCOMPtr<nsIStorageStream> storStream(do_QueryInterface(aOutStream));
if (!storStream)
return NS_OK;
// setup the upload channel if the destination is not local
nsCOMPtr<nsIInputStream> inputstream;
nsresult rv = storStream->NewInputStream(0, getter_AddRefs(inputstream));
@ -726,10 +721,17 @@ NS_IMETHODIMP nsWebBrowserPersist::OnDataAvailable(
// we're done with this pass; see if we need to do upload
nsXPIDLCString contentType;
channel->GetContentType(getter_Copies(contentType));
rv = StartUpload(data->mStream, data->mFile, contentType.get());
if (NS_FAILED(rv))
// if we don't have the right type of output stream then it's a local file
nsCOMPtr<nsIStorageStream> storStream(do_QueryInterface(data->mStream));
if (storStream)
{
cancel = PR_TRUE;
data->mStream->Close();
data->mStream = nsnull; // null out stream so we don't close it later
rv = StartUpload(storStream, data->mFile, contentType.get());
if (NS_FAILED(rv))
{
cancel = PR_TRUE;
}
}
}
}
@ -2254,8 +2256,13 @@ nsWebBrowserPersist::SaveDocumentWithFixup(
if (!localFile)
{
rv = StartUpload(outputStream, aFile, aFormatType);
NS_ENSURE_SUCCESS(rv, NS_ERROR_FAILURE);
nsCOMPtr<nsIStorageStream> storStream(do_QueryInterface(outputStream));
if (storStream)
{
outputStream->Close();
rv = StartUpload(storStream, aFile, aFormatType);
NS_ENSURE_SUCCESS(rv, NS_ERROR_FAILURE);
}
}
return rv;

4
mozilla/embedding/components/webbrowserpersist/src/nsWebBrowserPersist.h
View File

@ -46,6 +46,8 @@
#include "nsDOMWalker.h"
class nsEncoderNodeFixup;
class nsIStorageStream;
struct URIData;
class nsWebBrowserPersist : public nsIInterfaceRequestor,
@ -100,7 +102,7 @@ private:
nsILocalFile *aFile, nsIOutputStream **aOutputStream);
nsresult MakeOutputStreamFromURI(nsIURI *aURI, nsIOutputStream **aOutStream);
nsresult CreateChannelFromURI(nsIURI *aURI, nsIChannel **aChannel);
nsresult StartUpload(nsIOutputStream *aOutStream, nsIURI *aDestinationURI,
nsresult StartUpload(nsIStorageStream *aOutStream, nsIURI *aDestinationURI,
const char *aContentType);
nsresult CalculateAndAppendFileExt(nsIURI *aURI, nsIChannel *aChannel);
nsresult MakeFilenameFromURI(