From d8bbc7858622b6d9c278469aab701ca0b609cddf Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Wed, 15 May 2024 05:35:49 +0200 Subject: Merging upstream version 126.0. Signed-off-by: Daniel Baumann --- modules/libjar/nsIZipReader.idl | 2 +- modules/libjar/zipwriter/nsDeflateConverter.cpp | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) (limited to 'modules/libjar') diff --git a/modules/libjar/nsIZipReader.idl b/modules/libjar/nsIZipReader.idl index b6a1f70abd..abead2841a 100644 --- a/modules/libjar/nsIZipReader.idl +++ b/modules/libjar/nsIZipReader.idl @@ -225,7 +225,7 @@ interface nsIZipReaderCache : nsISupports /** * returns true if this zipreader already has this file cached */ - bool isCached(in nsIFile zipFile); + boolean isCached(in nsIFile zipFile); /** * Returns a (possibly shared) nsIZipReader for a zip inside another zip diff --git a/modules/libjar/zipwriter/nsDeflateConverter.cpp b/modules/libjar/zipwriter/nsDeflateConverter.cpp index b3f4301234..26aabc3ad5 100644 --- a/modules/libjar/zipwriter/nsDeflateConverter.cpp +++ b/modules/libjar/zipwriter/nsDeflateConverter.cpp @@ -133,6 +133,11 @@ NS_IMETHODIMP nsDeflateConverter::OnDataAvailable(nsIRequest* aRequest, return NS_OK; } +NS_IMETHODIMP +nsDeflateConverter::MaybeRetarget(nsIRequest* request) { + return NS_ERROR_NOT_IMPLEMENTED; +} + NS_IMETHODIMP nsDeflateConverter::OnStartRequest(nsIRequest* aRequest) { if (!mListener) return NS_ERROR_NOT_INITIALIZED; -- cgit v1.2.3