Bug 536324 part 2 - Change implementers of nsIChannel. r=sworkman

nwgh · nwgh · commit 6e789d3d0404 · 2012-10-22T10:51:07.000-07:00
diff --git a/dom/src/jsurl/nsJSProtocolHandler.cpp b/dom/src/jsurl/nsJSProtocolHandler.cpp
@@ -1045,13 +1045,13 @@ nsJSChannel::GetContentDispositionHeader(nsACString &aContentDispositionHeader)
 }
 
 NS_IMETHODIMP
-nsJSChannel::GetContentLength(int32_t *aContentLength)
+nsJSChannel::GetContentLength(int64_t *aContentLength)
 {
     return mStreamChannel->GetContentLength(aContentLength);
 }
 
 NS_IMETHODIMP
-nsJSChannel::SetContentLength(int32_t aContentLength)
+nsJSChannel::SetContentLength(int64_t aContentLength)
 {
     return mStreamChannel->SetContentLength(aContentLength);
 }
diff --git a/image/decoders/icon/mac/nsIconChannel.h b/image/decoders/icon/mac/nsIconChannel.h
@@ -38,7 +38,7 @@ class nsIconChannel MOZ_FINAL : public nsIChannel, public nsIStreamListener
 protected:
   nsCOMPtr<nsIURI> mUrl;
   nsCOMPtr<nsIURI> mOriginalURI;
-  int32_t          mContentLength;
+  int64_t          mContentLength;
   nsCOMPtr<nsILoadGroup> mLoadGroup;
   nsCOMPtr<nsIInterfaceRequestor> mCallbacks;
   nsCOMPtr<nsISupports>  mOwner; 
diff --git a/image/decoders/icon/mac/nsIconChannelCocoa.mm b/image/decoders/icon/mac/nsIconChannelCocoa.mm
@@ -391,13 +391,13 @@
   return NS_ERROR_NOT_AVAILABLE;
 }
 
-NS_IMETHODIMP nsIconChannel::GetContentLength(int32_t *aContentLength)
+NS_IMETHODIMP nsIconChannel::GetContentLength(int64_t *aContentLength)
 {
   *aContentLength = mContentLength;
   return NS_OK;
 }
 
-NS_IMETHODIMP nsIconChannel::SetContentLength(int32_t aContentLength)
+NS_IMETHODIMP nsIconChannel::SetContentLength(int64_t aContentLength)
 {
   NS_NOTREACHED("nsIconChannel::SetContentLength");
   return NS_ERROR_NOT_IMPLEMENTED;
diff --git a/image/decoders/icon/os2/nsIconChannel.cpp b/image/decoders/icon/os2/nsIconChannel.cpp
@@ -629,13 +629,13 @@ nsIconChannel::GetContentDispositionHeader(nsACString &aContentDispositionHeader
   return NS_ERROR_NOT_AVAILABLE;
 }
 
-NS_IMETHODIMP nsIconChannel::GetContentLength(int32_t *aContentLength)
+NS_IMETHODIMP nsIconChannel::GetContentLength(int64_t *aContentLength)
 {
   *aContentLength = mContentLength;
   return NS_OK;
 }
 
-NS_IMETHODIMP nsIconChannel::SetContentLength(int32_t aContentLength)
+NS_IMETHODIMP nsIconChannel::SetContentLength(int64_t aContentLength)
 {
   NS_NOTREACHED("nsIconChannel::SetContentLength");
   return NS_ERROR_NOT_IMPLEMENTED;
diff --git a/image/decoders/icon/os2/nsIconChannel.h b/image/decoders/icon/os2/nsIconChannel.h
@@ -38,7 +38,7 @@ class nsIconChannel MOZ_FINAL : public nsIChannel, public nsIStreamListener
 protected:
   nsCOMPtr<nsIURI> mUrl;
   nsCOMPtr<nsIURI> mOriginalURI;
-  int32_t          mContentLength;
+  int64_t          mContentLength;
   nsCOMPtr<nsILoadGroup> mLoadGroup;
   nsCOMPtr<nsIInterfaceRequestor> mCallbacks;
   nsCOMPtr<nsISupports>  mOwner; 
diff --git a/image/decoders/icon/win/nsIconChannel.cpp b/image/decoders/icon/win/nsIconChannel.cpp
@@ -643,13 +643,13 @@ nsIconChannel::GetContentDispositionHeader(nsACString &aContentDispositionHeader
   return NS_ERROR_NOT_AVAILABLE;
 }
 
-NS_IMETHODIMP nsIconChannel::GetContentLength(int32_t *aContentLength)
+NS_IMETHODIMP nsIconChannel::GetContentLength(int64_t *aContentLength)
 {
   *aContentLength = mContentLength;
   return NS_OK;
 }
 
-NS_IMETHODIMP nsIconChannel::SetContentLength(int32_t aContentLength)
+NS_IMETHODIMP nsIconChannel::SetContentLength(int64_t aContentLength)
 {
   NS_NOTREACHED("nsIconChannel::SetContentLength");
   return NS_ERROR_NOT_IMPLEMENTED;
diff --git a/image/decoders/icon/win/nsIconChannel.h b/image/decoders/icon/win/nsIconChannel.h
@@ -41,7 +41,7 @@ class nsIconChannel MOZ_FINAL : public nsIChannel, public nsIStreamListener
 protected:
   nsCOMPtr<nsIURI> mUrl;
   nsCOMPtr<nsIURI> mOriginalURI;
-  int32_t          mContentLength;
+  int64_t          mContentLength;
   nsCOMPtr<nsILoadGroup> mLoadGroup;
   nsCOMPtr<nsIInterfaceRequestor> mCallbacks;
   nsCOMPtr<nsISupports>  mOwner; 
diff --git a/modules/libjar/nsJARChannel.cpp b/modules/libjar/nsJARChannel.cpp
@@ -83,7 +83,7 @@ class nsJARInputThunk : public nsIInputStream
         NS_IF_ADDREF(*result = mJarReader);
     }
 
-    int32_t GetContentLength()
+    int64_t GetContentLength()
     {
         return mContentLength;
     }
@@ -97,7 +97,7 @@ class nsJARInputThunk : public nsIInputStream
     nsCString                   mJarDirSpec;
     nsCOMPtr<nsIInputStream>    mJarStream;
     nsCString                   mJarEntry;
-    int32_t                     mContentLength;
+    int64_t                     mContentLength;
 };
 
 NS_IMPL_THREADSAFE_ISUPPORTS1(nsJARInputThunk, nsIInputStream)
@@ -136,7 +136,7 @@ nsJARInputThunk::EnsureJarStream()
     rv = mJarStream->Available((uint64_t *) &avail);
     if (NS_FAILED(rv)) return rv;
 
-    mContentLength = avail < INT32_MAX ? (int32_t) avail : -1;
+    mContentLength = avail < INT64_MAX ? (int64_t) avail : -1;
 
     return NS_OK;
 }
@@ -639,7 +639,7 @@ nsJARChannel::GetContentDispositionHeader(nsACString &aContentDispositionHeader)
 }
 
 NS_IMETHODIMP
-nsJARChannel::GetContentLength(int32_t *result)
+nsJARChannel::GetContentLength(int64_t *result)
 {
     // if content length is unknown, query mJarInput...
     if (mContentLength < 0 && mJarInput)
@@ -650,7 +650,7 @@ nsJARChannel::GetContentLength(int32_t *result)
 }
 
 NS_IMETHODIMP
-nsJARChannel::SetContentLength(int32_t aContentLength)
+nsJARChannel::SetContentLength(int64_t aContentLength)
 {
     // XXX does this really make any sense at all?
     mContentLength = aContentLength;
diff --git a/modules/libjar/nsJARChannel.h b/modules/libjar/nsJARChannel.h
@@ -71,7 +71,7 @@ class nsJARChannel : public nsIJARChannel
     /* mContentDisposition is uninitialized if mContentDispositionHeader is
      * empty */
     uint32_t                        mContentDisposition;
-    int32_t                         mContentLength;
+    int64_t                         mContentLength;
     uint32_t                        mLoadFlags;
     nsresult                        mStatus;
     bool                            mIsPending;
diff --git a/netwerk/base/public/nsChannelProperties.h b/netwerk/base/public/nsChannelProperties.h
@@ -18,15 +18,6 @@
  */
 
 
-/**
- * Content-Length of a channel. Used instead of the nsIChannel.contentLength
- * property.
- * Not available before onStartRequest has been called.
- * Type: uint64_t
- */
-#define NS_CHANNEL_PROP_CONTENT_LENGTH_STR "content-length"
-
-
 /**
  * Exists to allow content policy mechanism to function properly during channel
  * redirects.  Contains security contextual information about the load.
@@ -35,11 +26,8 @@
 #define NS_CHANNEL_PROP_CHANNEL_POLICY_STR "channel-policy"
 
 #ifdef IMPL_NS_NET
-#define NS_CHANNEL_PROP_CONTENT_LENGTH gNetStrings->kContentLength
 #define NS_CHANNEL_PROP_CHANNEL_POLICY gNetStrings->kChannelPolicy
 #else
-#define NS_CHANNEL_PROP_CONTENT_LENGTH \
-  NS_LITERAL_STRING(NS_CHANNEL_PROP_CONTENT_LENGTH_STR)
 #define NS_CHANNEL_PROP_CHANNEL_POLICY \
   NS_LITERAL_STRING(NS_CHANNEL_PROP_CHANNEL_POLICY_STR)
 #endif
diff --git a/netwerk/base/public/nsNetStrings.h b/netwerk/base/public/nsNetStrings.h
@@ -15,8 +15,6 @@ class nsNetStrings {
 public:
   nsNetStrings();
 
-  /** "content-length" */
-  const nsLiteralString kContentLength;
   const nsLiteralString kChannelPolicy;
 };
 
diff --git a/netwerk/base/src/nsBaseChannel.cpp b/netwerk/base/src/nsBaseChannel.cpp
@@ -61,6 +61,7 @@ nsBaseChannel::nsBaseChannel()
   , mWaitingOnAsyncRedirect(false)
   , mStatus(NS_OK)
   , mContentDispositionHint(UINT32_MAX)
+  , mContentLength(-1)
 {
   mContentType.AssignLiteral(UNKNOWN_CONTENT_TYPE);
 }
@@ -163,23 +164,6 @@ nsBaseChannel::HasContentTypeHint() const
   return !mContentType.EqualsLiteral(UNKNOWN_CONTENT_TYPE);
 }
 
-void
-nsBaseChannel::SetContentLength64(int64_t len)
-{
-  // XXX: Storing the content-length as a property may not be what we want.
-  //      It has the drawback of being copied if we redirect this channel.
-  //      Maybe it is time for nsIChannel2.
-  SetPropertyAsInt64(NS_CHANNEL_PROP_CONTENT_LENGTH, len);
-}
-
-int64_t
-nsBaseChannel::ContentLength64()
-{
-  int64_t len;
-  nsresult rv = GetPropertyAsInt64(NS_CHANNEL_PROP_CONTENT_LENGTH, &len);
-  return NS_SUCCEEDED(rv) ? len : -1;
-}
-
 nsresult
 nsBaseChannel::PushStreamConverter(const char *fromType,
                                    const char *toType,
@@ -200,7 +184,7 @@ nsBaseChannel::PushStreamConverter(const char *fromType,
   if (NS_SUCCEEDED(rv)) {
     mListener = converter;
     if (invalidatesContentLength)
-      SetContentLength64(-1);
+      mContentLength = -1;
     if (result) {
       *result = nullptr;
       converter.swap(*result);
@@ -550,20 +534,16 @@ nsBaseChannel::GetContentDispositionHeader(nsACString &aContentDispositionHeader
 }
 
 NS_IMETHODIMP
-nsBaseChannel::GetContentLength(int32_t *aContentLength)
+nsBaseChannel::GetContentLength(int64_t *aContentLength)
 {
-  int64_t len = ContentLength64();
-  if (len > INT32_MAX || len < 0)
-    *aContentLength = -1;
-  else
-    *aContentLength = (int32_t) len;
+  *aContentLength = mContentLength;
   return NS_OK;
 }
 
 NS_IMETHODIMP
-nsBaseChannel::SetContentLength(int32_t aContentLength)
+nsBaseChannel::SetContentLength(int64_t aContentLength)
 {
-  SetContentLength64(aContentLength);
+  mContentLength = aContentLength;
   return NS_OK;
 }
 
@@ -794,8 +774,7 @@ nsBaseChannel::OnDataAvailable(nsIRequest *request, nsISupports *ctxt,
                                            offset, count);
   if (mSynthProgressEvents && NS_SUCCEEDED(rv)) {
     uint64_t prog = offset + count;
-    uint64_t progMax = ContentLength64();
-    OnTransportStatus(nullptr, NS_NET_STATUS_READING, prog, progMax);
+    OnTransportStatus(nullptr, NS_NET_STATUS_READING, prog, mContentLength);
   }
 
   return rv;
diff --git a/netwerk/base/src/nsBaseChannel.h b/netwerk/base/src/nsBaseChannel.h
@@ -156,11 +156,6 @@ class nsBaseChannel : public nsHashPropertyBag
     return mPump || mWaitingOnAsyncRedirect;
   }
 
-  // Set the content length that should be reported for this channel.  Pass -1
-  // to indicate an unspecified content length.
-  void SetContentLength64(int64_t len);
-  int64_t ContentLength64();
-
   // Helper function for querying the channel's notification callbacks.
   template <class T> void GetCallback(nsCOMPtr<T> &result) {
     GetInterface(NS_GET_TEMPLATE_IID(T), getter_AddRefs(result));
@@ -262,6 +257,7 @@ class nsBaseChannel : public nsHashPropertyBag
   bool                                mWaitingOnAsyncRedirect;
   bool                                mOpenRedirectChannel;
   uint32_t                            mRedirectFlags;
+  int64_t                             mContentLength;
 
 protected:
   nsCOMPtr<nsIURI>                    mURI;
diff --git a/netwerk/base/src/nsNetStrings.cpp b/netwerk/base/src/nsNetStrings.cpp
@@ -8,8 +8,7 @@
 NS_HIDDEN_(nsNetStrings*) gNetStrings;
 
 nsNetStrings::nsNetStrings()
-  : NS_LITERAL_STRING_INIT(kContentLength, NS_CHANNEL_PROP_CONTENT_LENGTH_STR),
-    NS_LITERAL_STRING_INIT(kChannelPolicy, NS_CHANNEL_PROP_CHANNEL_POLICY_STR)
+  : NS_LITERAL_STRING_INIT(kChannelPolicy, NS_CHANNEL_PROP_CHANNEL_POLICY_STR)
 {}
 
 
diff --git a/netwerk/protocol/http/HttpBaseChannel.cpp b/netwerk/protocol/http/HttpBaseChannel.cpp
@@ -427,20 +427,19 @@ HttpBaseChannel::GetContentDispositionHeader(nsACString& aContentDispositionHead
 }
 
 NS_IMETHODIMP
-HttpBaseChannel::GetContentLength(int32_t *aContentLength)
+HttpBaseChannel::GetContentLength(int64_t *aContentLength)
 {
   NS_ENSURE_ARG_POINTER(aContentLength);
 
   if (!mResponseHead)
     return NS_ERROR_NOT_AVAILABLE;
 
-  // XXX truncates to 32 bit
   *aContentLength = mResponseHead->ContentLength();
   return NS_OK;
 }
 
 NS_IMETHODIMP
-HttpBaseChannel::SetContentLength(int32_t value)
+HttpBaseChannel::SetContentLength(int64_t value)
 {
   NS_NOTYETIMPLEMENTED("HttpBaseChannel::SetContentLength");
   return NS_ERROR_NOT_IMPLEMENTED;
diff --git a/netwerk/protocol/http/HttpBaseChannel.h b/netwerk/protocol/http/HttpBaseChannel.h
@@ -92,8 +92,8 @@ class HttpBaseChannel : public nsHashPropertyBag
   NS_IMETHOD GetContentDispositionFilename(nsAString& aContentDispositionFilename);
   NS_IMETHOD SetContentDispositionFilename(const nsAString& aContentDispositionFilename);
   NS_IMETHOD GetContentDispositionHeader(nsACString& aContentDispositionHeader);
-  NS_IMETHOD GetContentLength(int32_t *aContentLength);
-  NS_IMETHOD SetContentLength(int32_t aContentLength);
+  NS_IMETHOD GetContentLength(int64_t *aContentLength);
+  NS_IMETHOD SetContentLength(int64_t aContentLength);
   NS_IMETHOD Open(nsIInputStream **aResult);
 
   // nsIEncodedChannel
diff --git a/netwerk/protocol/http/nsHttpChannel.cpp b/netwerk/protocol/http/nsHttpChannel.cpp
@@ -923,19 +923,12 @@ nsHttpChannel::CallOnStartRequest()
     if (mResponseHead && mResponseHead->ContentCharset().IsEmpty())
         mResponseHead->SetContentCharset(mContentCharsetHint);
 
-    if (mResponseHead) {
-        SetPropertyAsInt64(NS_CHANNEL_PROP_CONTENT_LENGTH,
-                           mResponseHead->ContentLength());
+    if (mResponseHead && mCacheEntry) {
         // If we have a cache entry, set its predicted size to ContentLength to
         // avoid caching an entry that will exceed the max size limit.
-        if (mCacheEntry) {
-            nsresult rv;
-            int64_t predictedDataSize = -1; // -1 in case GetAsInt64 fails.
-            GetPropertyAsInt64(NS_CHANNEL_PROP_CONTENT_LENGTH, 
-                               &predictedDataSize);
-            rv = mCacheEntry->SetPredictedDataSize(predictedDataSize);
-            if (NS_FAILED(rv)) return rv;
-        }
+        nsresult rv = mCacheEntry->SetPredictedDataSize(
+            mResponseHead->ContentLength());
+        NS_ENSURE_SUCCESS(rv, rv);
     }
     // Allow consumers to override our content type
     if ((mLoadFlags & LOAD_CALL_CONTENT_SNIFFERS) &&
diff --git a/netwerk/protocol/viewsource/nsViewSourceChannel.cpp b/netwerk/protocol/viewsource/nsViewSourceChannel.cpp
@@ -372,15 +372,15 @@ nsViewSourceChannel::GetContentDispositionHeader(nsACString &aContentDisposition
 }
 
 NS_IMETHODIMP
-nsViewSourceChannel::GetContentLength(int32_t *aContentLength)
+nsViewSourceChannel::GetContentLength(int64_t *aContentLength)
 {
     NS_ENSURE_TRUE(mChannel, NS_ERROR_FAILURE);
 
     return mChannel->GetContentLength(aContentLength);
 }
 
 NS_IMETHODIMP
-nsViewSourceChannel::SetContentLength(int32_t aContentLength)
+nsViewSourceChannel::SetContentLength(int64_t aContentLength)
 {
     NS_ENSURE_TRUE(mChannel, NS_ERROR_FAILURE);
 
diff --git a/netwerk/protocol/wyciwyg/WyciwygChannelChild.cpp b/netwerk/protocol/wyciwyg/WyciwygChannelChild.cpp
diff --git a/netwerk/protocol/wyciwyg/WyciwygChannelChild.h b/netwerk/protocol/wyciwyg/WyciwygChannelChild.h
diff --git a/netwerk/protocol/wyciwyg/WyciwygChannelParent.cpp b/netwerk/protocol/wyciwyg/WyciwygChannelParent.cpp
diff --git a/netwerk/protocol/wyciwyg/nsWyciwygChannel.cpp b/netwerk/protocol/wyciwyg/nsWyciwygChannel.cpp
diff --git a/netwerk/protocol/wyciwyg/nsWyciwygChannel.h b/netwerk/protocol/wyciwyg/nsWyciwygChannel.h
diff --git a/netwerk/streamconv/converters/nsMultiMixedConv.cpp b/netwerk/streamconv/converters/nsMultiMixedConv.cpp
diff --git a/uriloader/exthandler/ExternalHelperAppParent.cpp b/uriloader/exthandler/ExternalHelperAppParent.cpp
diff --git a/uriloader/exthandler/nsExternalProtocolHandler.cpp b/uriloader/exthandler/nsExternalProtocolHandler.cpp

Original file line number	Diff line number	Diff line change
`@@ -1045,13 +1045,13 @@ nsJSChannel::GetContentDispositionHeader(nsACString &aContentDispositionHeader)`
`1045`	`1045`	`}`
`1046`	`1046`
`1047`	`1047`	`NS_IMETHODIMP`
`1048`		`-nsJSChannel::GetContentLength(int32_t *aContentLength)`
	`1048`	`+nsJSChannel::GetContentLength(int64_t *aContentLength)`
`1049`	`1049`	`{`
`1050`	`1050`	`return mStreamChannel->GetContentLength(aContentLength);`
`1051`	`1051`	`}`
`1052`	`1052`
`1053`	`1053`	`NS_IMETHODIMP`
`1054`		`-nsJSChannel::SetContentLength(int32_t aContentLength)`
	`1054`	`+nsJSChannel::SetContentLength(int64_t aContentLength)`
`1055`	`1055`	`{`
`1056`	`1056`	`return mStreamChannel->SetContentLength(aContentLength);`
`1057`	`1057`	`}`
Original file line number	Diff line number	Diff line change
`@@ -391,13 +391,13 @@`
`391`	`391`	`return NS_ERROR_NOT_AVAILABLE;`
`392`	`392`	`}`
`393`	`393`
`394`		`-NS_IMETHODIMP nsIconChannel::GetContentLength(int32_t *aContentLength)`
	`394`	`+NS_IMETHODIMP nsIconChannel::GetContentLength(int64_t *aContentLength)`
`395`	`395`	`{`
`396`	`396`	`*aContentLength = mContentLength;`
`397`	`397`	`return NS_OK;`
`398`	`398`	`}`
`399`	`399`
`400`		`-NS_IMETHODIMP nsIconChannel::SetContentLength(int32_t aContentLength)`
	`400`	`+NS_IMETHODIMP nsIconChannel::SetContentLength(int64_t aContentLength)`
`401`	`401`	`{`
`402`	`402`	`NS_NOTREACHED("nsIconChannel::SetContentLength");`
`403`	`403`	`return NS_ERROR_NOT_IMPLEMENTED;`
Original file line number	Diff line number	Diff line change
`@@ -629,13 +629,13 @@ nsIconChannel::GetContentDispositionHeader(nsACString &aContentDispositionHeader`
`629`	`629`	`return NS_ERROR_NOT_AVAILABLE;`
`630`	`630`	`}`
`631`	`631`
`632`		`-NS_IMETHODIMP nsIconChannel::GetContentLength(int32_t *aContentLength)`
	`632`	`+NS_IMETHODIMP nsIconChannel::GetContentLength(int64_t *aContentLength)`
`633`	`633`	`{`
`634`	`634`	`*aContentLength = mContentLength;`
`635`	`635`	`return NS_OK;`
`636`	`636`	`}`
`637`	`637`
`638`		`-NS_IMETHODIMP nsIconChannel::SetContentLength(int32_t aContentLength)`
	`638`	`+NS_IMETHODIMP nsIconChannel::SetContentLength(int64_t aContentLength)`
`639`	`639`	`{`
`640`	`640`	`NS_NOTREACHED("nsIconChannel::SetContentLength");`
`641`	`641`	`return NS_ERROR_NOT_IMPLEMENTED;`
Original file line number	Diff line number	Diff line change
`@@ -643,13 +643,13 @@ nsIconChannel::GetContentDispositionHeader(nsACString &aContentDispositionHeader`
`643`	`643`	`return NS_ERROR_NOT_AVAILABLE;`
`644`	`644`	`}`
`645`	`645`
`646`		`-NS_IMETHODIMP nsIconChannel::GetContentLength(int32_t *aContentLength)`
	`646`	`+NS_IMETHODIMP nsIconChannel::GetContentLength(int64_t *aContentLength)`
`647`	`647`	`{`
`648`	`648`	`*aContentLength = mContentLength;`
`649`	`649`	`return NS_OK;`
`650`	`650`	`}`
`651`	`651`
`652`		`-NS_IMETHODIMP nsIconChannel::SetContentLength(int32_t aContentLength)`
	`652`	`+NS_IMETHODIMP nsIconChannel::SetContentLength(int64_t aContentLength)`
`653`	`653`	`{`
`654`	`654`	`NS_NOTREACHED("nsIconChannel::SetContentLength");`
`655`	`655`	`return NS_ERROR_NOT_IMPLEMENTED;`
Original file line number	Diff line number	Diff line change
`@@ -83,7 +83,7 @@ class nsJARInputThunk : public nsIInputStream`
`83`	`83`	`NS_IF_ADDREF(*result = mJarReader);`
`84`	`84`	`}`
`85`	`85`
`86`		`- int32_t GetContentLength()`
	`86`	`+ int64_t GetContentLength()`
`87`	`87`	`{`
`88`	`88`	`return mContentLength;`
`89`	`89`	`}`
`@@ -97,7 +97,7 @@ class nsJARInputThunk : public nsIInputStream`
`97`	`97`	`nsCString mJarDirSpec;`
`98`	`98`	`nsCOMPtr<nsIInputStream> mJarStream;`
`99`	`99`	`nsCString mJarEntry;`
`100`		`- int32_t mContentLength;`
	`100`	`+ int64_t mContentLength;`
`101`	`101`	`};`
`102`	`102`
`103`	`103`	`NS_IMPL_THREADSAFE_ISUPPORTS1(nsJARInputThunk, nsIInputStream)`
`@@ -136,7 +136,7 @@ nsJARInputThunk::EnsureJarStream()`
`136`	`136`	`rv = mJarStream->Available((uint64_t *) &avail);`
`137`	`137`	`if (NS_FAILED(rv)) return rv;`
`138`	`138`
`139`		`- mContentLength = avail < INT32_MAX ? (int32_t) avail : -1;`
	`139`	`+ mContentLength = avail < INT64_MAX ? (int64_t) avail : -1;`
`140`	`140`
`141`	`141`	`return NS_OK;`
`142`	`142`	`}`
`@@ -639,7 +639,7 @@ nsJARChannel::GetContentDispositionHeader(nsACString &aContentDispositionHeader)`
`639`	`639`	`}`
`640`	`640`
`641`	`641`	`NS_IMETHODIMP`
`642`		`-nsJARChannel::GetContentLength(int32_t *result)`
	`642`	`+nsJARChannel::GetContentLength(int64_t *result)`
`643`	`643`	`{`
`644`	`644`	`// if content length is unknown, query mJarInput...`
`645`	`645`	`if (mContentLength < 0 && mJarInput)`
`@@ -650,7 +650,7 @@ nsJARChannel::GetContentLength(int32_t *result)`
`650`	`650`	`}`
`651`	`651`
`652`	`652`	`NS_IMETHODIMP`
`653`		`-nsJARChannel::SetContentLength(int32_t aContentLength)`
	`653`	`+nsJARChannel::SetContentLength(int64_t aContentLength)`
`654`	`654`	`{`
`655`	`655`	`// XXX does this really make any sense at all?`
`656`	`656`	`mContentLength = aContentLength;`