/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- * * ***** BEGIN LICENSE BLOCK ***** * Version: MPL 1.1/GPL 2.0/LGPL 2.1 * * The contents of this file are subject to the Mozilla Public License Version * 1.1 (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at * http://www.mozilla.org/MPL/ * * Software distributed under the License is distributed on an "AS IS" basis, * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License * for the specific language governing rights and limitations under the * License. * * The Original Code is mozilla.org Code. * * The Initial Developer of the Original Code is * Netscape Communications Corporation. * Portions created by the Initial Developer are Copyright (C) 1998 * the Initial Developer. All Rights Reserved. * * Contributor(s): * Jeff Walden * * Alternatively, the contents of this file may be used under the terms of * either the GNU General Public License Version 2 or later (the "GPL"), or * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), * in which case the provisions of the GPL or the LGPL are applicable instead * of those above. If you wish to allow use of your version of this file only * under the terms of either the GPL or the LGPL, and not to allow others to * use your version of this file under the terms of the MPL, indicate your * decision by deleting the provisions above and replace them with the notice * and other provisions required by the GPL or the LGPL. If you do not delete * the provisions above, a recipient may use your version of this file under * the terms of any one of the MPL, the GPL or the LGPL. * * ***** END LICENSE BLOCK ***** */ #include "nsJAR.h" #include "nsJARChannel.h" #include "nsJARProtocolHandler.h" #include "nsMimeTypes.h" #include "nsNetUtil.h" #include "nsInt64.h" #include "nsEscape.h" #include "nsIPrefService.h" #include "nsIPrefBranch.h" #include "nsChannelProperties.h" #include "nsIScriptSecurityManager.h" #include "nsIPrincipal.h" #include "nsIFileURL.h" #include "nsIJAR.h" static NS_DEFINE_CID(kZipReaderCID, NS_ZIPREADER_CID); // the entry for a directory will either be empty (in the case of the // top-level directory) or will end with a slash #define ENTRY_IS_DIRECTORY(_entry) \ ((_entry).IsEmpty() || '/' == (_entry).Last()) //----------------------------------------------------------------------------- #if defined(PR_LOGGING) // // set NSPR_LOG_MODULES=nsJarProtocol:5 // static PRLogModuleInfo *gJarProtocolLog = nsnull; #endif #define LOG(args) PR_LOG(gJarProtocolLog, PR_LOG_DEBUG, args) #define LOG_ENABLED() PR_LOG_TEST(gJarProtocolLog, 4) //----------------------------------------------------------------------------- // nsJARInputThunk // // this class allows us to do some extra work on the stream transport thread. //----------------------------------------------------------------------------- class nsJARInputThunk : public nsIInputStream { public: NS_DECL_ISUPPORTS NS_DECL_NSIINPUTSTREAM nsJARInputThunk(nsIFile *jarFile, nsIURI* fullJarURI, const nsACString &jarEntry, nsIZipReaderCache *jarCache) : mJarCache(jarCache) , mJarFile(jarFile) , mJarEntry(jarEntry) , mContentLength(-1) { NS_ASSERTION(mJarFile, "no jar file"); if (fullJarURI) { nsresult rv = fullJarURI->GetAsciiSpec(mJarDirSpec); NS_ASSERTION(NS_SUCCEEDED(rv), "this shouldn't fail"); } } virtual ~nsJARInputThunk() { if (!mJarCache && mJarReader) mJarReader->Close(); } void GetJarReader(nsIZipReader **result) { NS_IF_ADDREF(*result = mJarReader); } PRInt32 GetContentLength() { return mContentLength; } nsresult EnsureJarStream(); private: nsCOMPtr mJarCache; nsCOMPtr mJarReader; nsCOMPtr mJarFile; nsCString mJarDirSpec; nsCOMPtr mJarStream; nsCString mJarEntry; PRInt32 mContentLength; }; NS_IMPL_THREADSAFE_ISUPPORTS1(nsJARInputThunk, nsIInputStream) nsresult nsJARInputThunk::EnsureJarStream() { if (mJarStream) return NS_OK; nsresult rv; if (mJarCache) rv = mJarCache->GetZip(mJarFile, getter_AddRefs(mJarReader)); else { // create an uncached jar reader mJarReader = do_CreateInstance(kZipReaderCID, &rv); if (NS_FAILED(rv)) return rv; rv = mJarReader->Open(mJarFile); } if (NS_FAILED(rv)) return rv; if (ENTRY_IS_DIRECTORY(mJarEntry)) { // A directory stream also needs the Spec of the FullJarURI // because is included in the stream data itself. NS_ENSURE_STATE(!mJarDirSpec.IsEmpty()); rv = mJarReader->GetInputStreamWithSpec(mJarDirSpec, mJarEntry.get(), getter_AddRefs(mJarStream)); } else { rv = mJarReader->GetInputStream(mJarEntry.get(), getter_AddRefs(mJarStream)); } if (NS_FAILED(rv)) { // convert to the proper result if the entry wasn't found // so that error pages work if (rv == NS_ERROR_FILE_TARGET_DOES_NOT_EXIST) rv = NS_ERROR_FILE_NOT_FOUND; return rv; } // ask the JarStream for the content length mJarStream->Available((PRUint32 *) &mContentLength); return NS_OK; } NS_IMETHODIMP nsJARInputThunk::Close() { if (mJarStream) return mJarStream->Close(); return NS_OK; } NS_IMETHODIMP nsJARInputThunk::Available(PRUint32 *avail) { nsresult rv = EnsureJarStream(); if (NS_FAILED(rv)) return rv; return mJarStream->Available(avail); } NS_IMETHODIMP nsJARInputThunk::Read(char *buf, PRUint32 count, PRUint32 *countRead) { nsresult rv = EnsureJarStream(); if (NS_FAILED(rv)) return rv; return mJarStream->Read(buf, count, countRead); } NS_IMETHODIMP nsJARInputThunk::ReadSegments(nsWriteSegmentFun writer, void *closure, PRUint32 count, PRUint32 *countRead) { // stream transport does only calls Read() return NS_ERROR_NOT_IMPLEMENTED; } NS_IMETHODIMP nsJARInputThunk::IsNonBlocking(PRBool *nonBlocking) { *nonBlocking = PR_FALSE; return NS_OK; } //----------------------------------------------------------------------------- // nsJARChannel //----------------------------------------------------------------------------- nsJARChannel::nsJARChannel() : mContentLength(-1) , mLoadFlags(LOAD_NORMAL) , mStatus(NS_OK) , mIsPending(PR_FALSE) , mIsUnsafe(PR_TRUE) , mJarInput(nsnull) { #if defined(PR_LOGGING) if (!gJarProtocolLog) gJarProtocolLog = PR_NewLogModule("nsJarProtocol"); #endif // hold an owning reference to the jar handler NS_ADDREF(gJarHandler); } nsJARChannel::~nsJARChannel() { // with the exception of certain error cases mJarInput will already be null. NS_IF_RELEASE(mJarInput); // release owning reference to the jar handler nsJARProtocolHandler *handler = gJarHandler; NS_RELEASE(handler); // NULL parameter } NS_IMPL_ISUPPORTS_INHERITED6(nsJARChannel, nsHashPropertyBag, nsIRequest, nsIChannel, nsIStreamListener, nsIRequestObserver, nsIDownloadObserver, nsIJARChannel) nsresult nsJARChannel::Init(nsIURI *uri) { nsresult rv; rv = nsHashPropertyBag::Init(); if (NS_FAILED(rv)) return rv; mJarURI = do_QueryInterface(uri, &rv); if (NS_FAILED(rv)) return rv; mOriginalURI = mJarURI; // Prevent loading jar:javascript URIs (see bug 290982). nsCOMPtr innerURI; rv = mJarURI->GetJARFile(getter_AddRefs(innerURI)); if (NS_FAILED(rv)) return rv; PRBool isJS; rv = innerURI->SchemeIs("javascript", &isJS); if (NS_FAILED(rv)) return rv; if (isJS) { NS_WARNING("blocking jar:javascript:"); return NS_ERROR_INVALID_ARG; } #if defined(PR_LOGGING) mJarURI->GetSpec(mSpec); #endif return rv; } nsresult nsJARChannel::CreateJarInput(nsIZipReaderCache *jarCache) { // important to pass a clone of the file since the nsIFile impl is not // necessarily MT-safe nsCOMPtr clonedFile; nsresult rv = mJarFile->Clone(getter_AddRefs(clonedFile)); if (NS_FAILED(rv)) return rv; mJarInput = new nsJARInputThunk(clonedFile, mJarURI, mJarEntry, jarCache); if (!mJarInput) return NS_ERROR_OUT_OF_MEMORY; NS_ADDREF(mJarInput); return NS_OK; } nsresult nsJARChannel::EnsureJarInput(PRBool blocking) { LOG(("nsJARChannel::EnsureJarInput [this=%x %s]\n", this, mSpec.get())); nsresult rv; nsCOMPtr uri; rv = mJarURI->GetJARFile(getter_AddRefs(mJarBaseURI)); if (NS_FAILED(rv)) return rv; rv = mJarURI->GetJAREntry(mJarEntry); if (NS_FAILED(rv)) return rv; // The name of the JAR entry must not contain URL-escaped characters: // we're moving from URL domain to a filename domain here. nsStandardURL // does basic escaping by default, which breaks reading zipped files which // have e.g. spaces in their filenames. NS_UnescapeURL(mJarEntry); // try to get a nsIFile directly from the url, which will often succeed. { nsCOMPtr fileURL = do_QueryInterface(mJarBaseURI); if (fileURL) fileURL->GetFile(getter_AddRefs(mJarFile)); } if (mJarFile) { mIsUnsafe = PR_FALSE; // NOTE: we do not need to deal with mSecurityInfo here, // because we're loading from a local file rv = CreateJarInput(gJarHandler->JarCache()); } else if (blocking) { NS_NOTREACHED("need sync downloader"); rv = NS_ERROR_NOT_IMPLEMENTED; } else { // kick off an async download of the base URI... rv = NS_NewDownloader(getter_AddRefs(mDownloader), this); if (NS_SUCCEEDED(rv)) rv = NS_OpenURI(mDownloader, nsnull, mJarBaseURI, nsnull, mLoadGroup, mCallbacks, mLoadFlags & ~(LOAD_DOCUMENT_URI | LOAD_CALL_CONTENT_SNIFFERS)); } return rv; } //----------------------------------------------------------------------------- // nsIRequest //----------------------------------------------------------------------------- NS_IMETHODIMP nsJARChannel::GetName(nsACString &result) { return mJarURI->GetSpec(result); } NS_IMETHODIMP nsJARChannel::IsPending(PRBool *result) { *result = mIsPending; return NS_OK; } NS_IMETHODIMP nsJARChannel::GetStatus(nsresult *status) { if (mPump && NS_SUCCEEDED(mStatus)) mPump->GetStatus(status); else *status = mStatus; return NS_OK; } NS_IMETHODIMP nsJARChannel::Cancel(nsresult status) { mStatus = status; if (mPump) return mPump->Cancel(status); NS_ASSERTION(!mIsPending, "need to implement cancel when downloading"); return NS_OK; } NS_IMETHODIMP nsJARChannel::Suspend() { if (mPump) return mPump->Suspend(); NS_ASSERTION(!mIsPending, "need to implement suspend when downloading"); return NS_OK; } NS_IMETHODIMP nsJARChannel::Resume() { if (mPump) return mPump->Resume(); NS_ASSERTION(!mIsPending, "need to implement resume when downloading"); return NS_OK; } NS_IMETHODIMP nsJARChannel::GetLoadFlags(nsLoadFlags *aLoadFlags) { *aLoadFlags = mLoadFlags; return NS_OK; } NS_IMETHODIMP nsJARChannel::SetLoadFlags(nsLoadFlags aLoadFlags) { mLoadFlags = aLoadFlags; return NS_OK; } NS_IMETHODIMP nsJARChannel::GetLoadGroup(nsILoadGroup **aLoadGroup) { NS_IF_ADDREF(*aLoadGroup = mLoadGroup); return NS_OK; } NS_IMETHODIMP nsJARChannel::SetLoadGroup(nsILoadGroup *aLoadGroup) { mLoadGroup = aLoadGroup; return NS_OK; } //----------------------------------------------------------------------------- // nsIChannel //----------------------------------------------------------------------------- NS_IMETHODIMP nsJARChannel::GetOriginalURI(nsIURI **aURI) { *aURI = mOriginalURI; NS_ADDREF(*aURI); return NS_OK; } NS_IMETHODIMP nsJARChannel::SetOriginalURI(nsIURI *aURI) { NS_ENSURE_ARG_POINTER(aURI); mOriginalURI = aURI; return NS_OK; } NS_IMETHODIMP nsJARChannel::GetURI(nsIURI **aURI) { NS_IF_ADDREF(*aURI = mJarURI); return NS_OK; } NS_IMETHODIMP nsJARChannel::GetOwner(nsISupports **result) { nsresult rv; if (mOwner) { NS_ADDREF(*result = mOwner); return NS_OK; } if (!mJarInput) { *result = nsnull; return NS_OK; } //-- Verify signature, if one is present, and set owner accordingly nsCOMPtr jarReader; mJarInput->GetJarReader(getter_AddRefs(jarReader)); if (!jarReader) return NS_ERROR_NOT_INITIALIZED; nsCOMPtr jar = do_QueryInterface(jarReader, &rv); if (NS_FAILED(rv)) { NS_ERROR("nsIJAR not supported"); return rv; } nsCOMPtr cert; rv = jar->GetCertificatePrincipal(mJarEntry.get(), getter_AddRefs(cert)); if (NS_FAILED(rv)) return rv; if (cert) { nsCAutoString certFingerprint; rv = cert->GetFingerprint(certFingerprint); if (NS_FAILED(rv)) return rv; nsCAutoString subjectName; rv = cert->GetSubjectName(subjectName); if (NS_FAILED(rv)) return rv; nsCAutoString prettyName; rv = cert->GetPrettyName(prettyName); if (NS_FAILED(rv)) return rv; nsCOMPtr certificate; rv = cert->GetCertificate(getter_AddRefs(certificate)); if (NS_FAILED(rv)) return rv; nsCOMPtr secMan = do_GetService(NS_SCRIPTSECURITYMANAGER_CONTRACTID, &rv); if (NS_FAILED(rv)) return rv; rv = secMan->GetCertificatePrincipal(certFingerprint, subjectName, prettyName, certificate, mJarBaseURI, getter_AddRefs(cert)); if (NS_FAILED(rv)) return rv; mOwner = do_QueryInterface(cert, &rv); if (NS_FAILED(rv)) return rv; NS_ADDREF(*result = mOwner); } return NS_OK; } NS_IMETHODIMP nsJARChannel::SetOwner(nsISupports *aOwner) { mOwner = aOwner; return NS_OK; } NS_IMETHODIMP nsJARChannel::GetNotificationCallbacks(nsIInterfaceRequestor **aCallbacks) { NS_IF_ADDREF(*aCallbacks = mCallbacks); return NS_OK; } NS_IMETHODIMP nsJARChannel::SetNotificationCallbacks(nsIInterfaceRequestor *aCallbacks) { mCallbacks = aCallbacks; return NS_OK; } NS_IMETHODIMP nsJARChannel::GetSecurityInfo(nsISupports **aSecurityInfo) { NS_PRECONDITION(aSecurityInfo, "Null out param"); NS_IF_ADDREF(*aSecurityInfo = mSecurityInfo); return NS_OK; } NS_IMETHODIMP nsJARChannel::GetContentType(nsACString &result) { if (mContentType.IsEmpty()) { // // generate content type and set it // const char *ext = nsnull, *fileName = mJarEntry.get(); PRInt32 len = mJarEntry.Length(); // check if we're displaying a directory // mJarEntry will be empty if we're trying to display // the topmost directory in a zip, e.g. jar:foo.zip!/ if (ENTRY_IS_DIRECTORY(mJarEntry)) { mContentType.AssignLiteral(APPLICATION_HTTP_INDEX_FORMAT); } else { // not a directory, take a guess by its extension for (PRInt32 i = len-1; i >= 0; i--) { if (fileName[i] == '.') { ext = &fileName[i + 1]; break; } } if (ext) { nsIMIMEService *mimeServ = gJarHandler->MimeService(); if (mimeServ) mimeServ->GetTypeFromExtension(nsDependentCString(ext), mContentType); } if (mContentType.IsEmpty()) mContentType.AssignLiteral(UNKNOWN_CONTENT_TYPE); } } result = mContentType; return NS_OK; } NS_IMETHODIMP nsJARChannel::SetContentType(const nsACString &aContentType) { // If someone gives us a type hint we should just use that type instead of // doing our guessing. So we don't care when this is being called. // mContentCharset is unchanged if not parsed NS_ParseContentType(aContentType, mContentType, mContentCharset); return NS_OK; } NS_IMETHODIMP nsJARChannel::GetContentCharset(nsACString &aContentCharset) { // If someone gives us a charset hint we should just use that charset. // So we don't care when this is being called. aContentCharset = mContentCharset; return NS_OK; } NS_IMETHODIMP nsJARChannel::SetContentCharset(const nsACString &aContentCharset) { mContentCharset = aContentCharset; return NS_OK; } NS_IMETHODIMP nsJARChannel::GetContentLength(PRInt32 *result) { // if content length is unknown, query mJarInput... if (mContentLength < 0 && mJarInput) mContentLength = mJarInput->GetContentLength(); *result = mContentLength; return NS_OK; } NS_IMETHODIMP nsJARChannel::SetContentLength(PRInt32 aContentLength) { // XXX does this really make any sense at all? mContentLength = aContentLength; return NS_OK; } NS_IMETHODIMP nsJARChannel::Open(nsIInputStream **stream) { LOG(("nsJARChannel::Open [this=%x]\n", this)); NS_ENSURE_TRUE(!mJarInput, NS_ERROR_IN_PROGRESS); NS_ENSURE_TRUE(!mIsPending, NS_ERROR_IN_PROGRESS); mJarFile = nsnull; mIsUnsafe = PR_TRUE; nsresult rv = EnsureJarInput(PR_TRUE); if (NS_FAILED(rv)) return rv; if (!mJarInput) return NS_ERROR_UNEXPECTED; // force load the jar file now so GetContentLength will return a // meaningful value once we return. mJarInput->EnsureJarStream(); NS_ADDREF(*stream = mJarInput); return NS_OK; } NS_IMETHODIMP nsJARChannel::AsyncOpen(nsIStreamListener *listener, nsISupports *ctx) { LOG(("nsJARChannel::AsyncOpen [this=%x]\n", this)); NS_ENSURE_ARG_POINTER(listener); NS_ENSURE_TRUE(!mIsPending, NS_ERROR_IN_PROGRESS); mJarFile = nsnull; mIsUnsafe = PR_TRUE; // Initialize mProgressSink NS_QueryNotificationCallbacks(mCallbacks, mLoadGroup, mProgressSink); nsresult rv = EnsureJarInput(PR_FALSE); if (NS_FAILED(rv)) return rv; // These variables must only be set if we're going to trigger an // OnStartRequest, either from AsyncRead or OnDownloadComplete. mListener = listener; mListenerContext = ctx; mIsPending = PR_TRUE; if (mJarInput) { // create input stream pump and call AsyncRead as a block rv = NS_NewInputStreamPump(getter_AddRefs(mPump), mJarInput); if (NS_SUCCEEDED(rv)) rv = mPump->AsyncRead(this, nsnull); // If we failed to create the pump or initiate the AsyncRead, // then we need to clear these variables. if (NS_FAILED(rv)) { mIsPending = PR_FALSE; mListenerContext = nsnull; mListener = nsnull; return rv; } } if (mLoadGroup) mLoadGroup->AddRequest(this, nsnull); return NS_OK; } //----------------------------------------------------------------------------- // nsIJARChannel //----------------------------------------------------------------------------- NS_IMETHODIMP nsJARChannel::GetIsUnsafe(PRBool *isUnsafe) { *isUnsafe = mIsUnsafe; return NS_OK; } //----------------------------------------------------------------------------- // nsIDownloadObserver //----------------------------------------------------------------------------- NS_IMETHODIMP nsJARChannel::OnDownloadComplete(nsIDownloader *downloader, nsIRequest *request, nsISupports *context, nsresult status, nsIFile *file) { nsresult rv; nsCOMPtr channel(do_QueryInterface(request)); if (channel) { PRUint32 loadFlags; channel->GetLoadFlags(&loadFlags); if (loadFlags & LOAD_REPLACE) { mLoadFlags |= LOAD_REPLACE; if (!mOriginalURI) { SetOriginalURI(mJarURI); } nsCOMPtr innerURI; rv = channel->GetURI(getter_AddRefs(innerURI)); if (NS_SUCCEEDED(rv)) { nsCOMPtr newURI; rv = mJarURI->CloneWithJARFile(innerURI, getter_AddRefs(newURI)); if (NS_SUCCEEDED(rv)) { mJarURI = newURI; } } if (NS_SUCCEEDED(status)) { status = rv; } } } if (NS_SUCCEEDED(status) && channel) { nsCAutoString header; // Grab the security info from our base channel channel->GetSecurityInfo(getter_AddRefs(mSecurityInfo)); nsCOMPtr httpChannel(do_QueryInterface(channel)); if (httpChannel) { // We only want to run scripts if the server really intended to // send us a JAR file. Check the server-supplied content type for // a JAR type. httpChannel->GetResponseHeader(NS_LITERAL_CSTRING("Content-Type"), header); nsCAutoString contentType; nsCAutoString charset; NS_ParseContentType(header, contentType, charset); mIsUnsafe = !contentType.EqualsLiteral("application/java-archive") && !contentType.EqualsLiteral("application/x-jar"); rv = httpChannel->GetResponseHeader(NS_LITERAL_CSTRING("Content-Disposition"), header); if (NS_SUCCEEDED(rv)) SetPropertyAsACString(NS_CHANNEL_PROP_CONTENT_DISPOSITION, header); } else { nsCOMPtr innerJARChannel(do_QueryInterface(channel)); if (innerJARChannel) { PRBool unsafe; innerJARChannel->GetIsUnsafe(&unsafe); mIsUnsafe = unsafe; } // Soon-to-be common way to get Disposition: right now only nsIJARChannel rv = NS_GetContentDisposition(request, header); if (NS_SUCCEEDED(rv)) SetPropertyAsACString(NS_CHANNEL_PROP_CONTENT_DISPOSITION, header); } } if (NS_SUCCEEDED(status) && mIsUnsafe) { PRBool allowUnpack = PR_FALSE; nsCOMPtr prefs = do_GetService(NS_PREFSERVICE_CONTRACTID); if (prefs) { prefs->GetBoolPref("network.jar.open-unsafe-types", &allowUnpack); } if (!allowUnpack) { status = NS_ERROR_UNSAFE_CONTENT_TYPE; } } if (NS_SUCCEEDED(status)) { mJarFile = file; rv = CreateJarInput(nsnull); if (NS_SUCCEEDED(rv)) { // create input stream pump rv = NS_NewInputStreamPump(getter_AddRefs(mPump), mJarInput); if (NS_SUCCEEDED(rv)) rv = mPump->AsyncRead(this, nsnull); } status = rv; } if (NS_FAILED(status)) { mStatus = status; OnStartRequest(nsnull, nsnull); OnStopRequest(nsnull, nsnull, status); } return NS_OK; } //----------------------------------------------------------------------------- // nsIStreamListener //----------------------------------------------------------------------------- NS_IMETHODIMP nsJARChannel::OnStartRequest(nsIRequest *req, nsISupports *ctx) { LOG(("nsJARChannel::OnStartRequest [this=%x %s]\n", this, mSpec.get())); return mListener->OnStartRequest(this, mListenerContext); } NS_IMETHODIMP nsJARChannel::OnStopRequest(nsIRequest *req, nsISupports *ctx, nsresult status) { LOG(("nsJARChannel::OnStopRequest [this=%x %s status=%x]\n", this, mSpec.get(), status)); if (NS_SUCCEEDED(mStatus)) mStatus = status; if (mListener) { mListener->OnStopRequest(this, mListenerContext, status); mListener = 0; mListenerContext = 0; } if (mLoadGroup) mLoadGroup->RemoveRequest(this, nsnull, status); mPump = 0; NS_IF_RELEASE(mJarInput); mIsPending = PR_FALSE; mDownloader = 0; // this may delete the underlying jar file // Drop notification callbacks to prevent cycles. mCallbacks = 0; mProgressSink = 0; return NS_OK; } NS_IMETHODIMP nsJARChannel::OnDataAvailable(nsIRequest *req, nsISupports *ctx, nsIInputStream *stream, PRUint32 offset, PRUint32 count) { #if defined(PR_LOGGING) LOG(("nsJARChannel::OnDataAvailable [this=%x %s]\n", this, mSpec.get())); #endif nsresult rv; rv = mListener->OnDataAvailable(this, mListenerContext, stream, offset, count); // simply report progress here instead of hooking ourselves up as a // nsITransportEventSink implementation. // XXX do the 64-bit stuff for real if (mProgressSink && NS_SUCCEEDED(rv) && !(mLoadFlags & LOAD_BACKGROUND)) mProgressSink->OnProgress(this, nsnull, nsUint64(offset + count), nsUint64(mContentLength)); return rv; // let the pump cancel on failure }