diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-19 01:13:33 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-19 01:13:33 +0000 |
| commit | 086c044dc34dfc0f74fbe41f4ecb402b2cd34884 (patch) | |
| tree | a4f824bd33cb075dd5aa3eb5a0a94af221bbe83a /netwerk/protocol/data/nsDataChannel.cpp | |
| parent | Adding debian version 124.0.1-1. (diff) | |
| download | firefox-086c044dc34dfc0f74fbe41f4ecb402b2cd34884.tar.xz firefox-086c044dc34dfc0f74fbe41f4ecb402b2cd34884.zip | |
Merging upstream version 125.0.1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'netwerk/protocol/data/nsDataChannel.cpp')
| -rw-r--r-- | netwerk/protocol/data/nsDataChannel.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/netwerk/protocol/data/nsDataChannel.cpp b/netwerk/protocol/data/nsDataChannel.cpp index 87b00adea3..df40971e1c 100644 --- a/netwerk/protocol/data/nsDataChannel.cpp +++ b/netwerk/protocol/data/nsDataChannel.cpp @@ -8,6 +8,7 @@ #include "nsDataChannel.h" #include "mozilla/Base64.h" +#include "mozilla/dom/MimeType.h" #include "nsDataHandler.h" #include "nsIInputStream.h" #include "nsEscape.h" @@ -59,9 +60,10 @@ nsresult nsDataChannel::OpenContentStream(bool async, nsIInputStream** result, nsCString contentType, contentCharset; nsDependentCSubstring dataRange; + RefPtr<CMimeType> fullMimeType; bool lBase64; rv = nsDataHandler::ParsePathWithoutRef(path, contentType, &contentCharset, - lBase64, &dataRange, &mMimeType); + lBase64, &dataRange, &fullMimeType); if (NS_FAILED(rv)) return rv; // This will avoid a copy if nothing needs to be unescaped. @@ -103,6 +105,7 @@ nsresult nsDataChannel::OpenContentStream(bool async, nsIInputStream** result, SetContentType(contentType); SetContentCharset(contentCharset); + SetFullMimeType(std::move(fullMimeType)); mContentLength = contentLen; // notify "data-channel-opened" observers |