diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-19 01:14:29 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-19 01:14:29 +0000 |
| commit | fbaf0bb26397aa498eb9156f06d5a6fe34dd7dd8 (patch) | |
| tree | 4c1ccaf5486d4f2009f9a338a98a83e886e29c97 /netwerk/streamconv | |
| parent | Releasing progress-linux version 124.0.1-1~progress7.99u1. (diff) | |
| download | firefox-fbaf0bb26397aa498eb9156f06d5a6fe34dd7dd8.tar.xz firefox-fbaf0bb26397aa498eb9156f06d5a6fe34dd7dd8.zip | |
Merging upstream version 125.0.1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'netwerk/streamconv')
| -rw-r--r-- | netwerk/streamconv/converters/nsHTTPCompressConv.cpp | 9 | ||||
| -rw-r--r-- | netwerk/streamconv/mozITXTToHTMLConv.idl | 4 |
2 files changed, 8 insertions, 5 deletions
diff --git a/netwerk/streamconv/converters/nsHTTPCompressConv.cpp b/netwerk/streamconv/converters/nsHTTPCompressConv.cpp index da430a0611..e06c72222b 100644 --- a/netwerk/streamconv/converters/nsHTTPCompressConv.cpp +++ b/netwerk/streamconv/converters/nsHTTPCompressConv.cpp @@ -264,6 +264,7 @@ nsresult nsHTTPCompressConv::BrotliHandler(nsIInputStream* stream, reinterpret_cast<const char*>(outBuffer.get()), outSize))) { return self->mBrotli->mStatus; } + self->mBrotli->mSourceOffset += outSize; } // See bug 1759745. If the decoder has more output data, take it. @@ -276,6 +277,7 @@ nsresult nsHTTPCompressConv::BrotliHandler(nsIInputStream* stream, outSize))) { return self->mBrotli->mStatus; } + self->mBrotli->mSourceOffset += outSize; } if (res == BROTLI_DECODER_RESULT_SUCCESS || @@ -295,7 +297,9 @@ nsHTTPCompressConv::OnDataAvailable(nsIRequest* request, nsIInputStream* iStr, uint64_t aSourceOffset, uint32_t aCount) { nsresult rv = NS_ERROR_INVALID_CONTENT_ENCODING; uint32_t streamLen = aCount; - LOG(("nsHttpCompressConv %p OnDataAvailable %d", this, aCount)); + LOG(("nsHttpCompressConv %p OnDataAvailable aSourceOffset:%" PRIu64 + " count:%u", + this, aSourceOffset, aCount)); if (streamLen == 0) { NS_ERROR("count of zero passed to OnDataAvailable"); @@ -561,6 +565,9 @@ nsresult nsHTTPCompressConv::do_OnDataAvailable(nsIRequest* request, MutexAutoLock lock(mMutex); listener = mListener; } + LOG(("nsHTTPCompressConv::do_OnDataAvailable req:%p offset: offset:%" PRIu64 + "count:%u", + request, offset, count)); nsresult rv = listener->OnDataAvailable(request, mStream, offset, count); // Make sure the stream no longer references |buffer| in case our listener diff --git a/netwerk/streamconv/mozITXTToHTMLConv.idl b/netwerk/streamconv/mozITXTToHTMLConv.idl index 5a2a1510c9..53686802fe 100644 --- a/netwerk/streamconv/mozITXTToHTMLConv.idl +++ b/netwerk/streamconv/mozITXTToHTMLConv.idl @@ -14,10 +14,6 @@ #include "nsIStreamConverter.idl" %{C++ -// {77c0e42a-1dd2-11b2-8ebf-edc6606f2f4b} -#define MOZITXTTOHTMLCONV_CID \ - { 0x77c0e42a, 0x1dd2, 0x11b2, \ - { 0x8e, 0xbf, 0xed, 0xc6, 0x60, 0x6f, 0x2f, 0x4b } } #define MOZ_TXTTOHTMLCONV_CONTRACTID \ "@mozilla.org/txttohtmlconv;1" |