summaryrefslogtreecommitdiffstats
path: root/netwerk/streamconv
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-04-08 15:11:27 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-04-08 15:11:27 +0000
commitf3bcaf9f88aad2c423ebcd61121562f9834187d4 (patch)
treef22238c29b57707b645a350940e3e9bdf3ce1f5d /netwerk/streamconv
parentAdding debian version 115.7.0esr-1~deb12u1. (diff)
downloadfirefox-esr-f3bcaf9f88aad2c423ebcd61121562f9834187d4.tar.xz
firefox-esr-f3bcaf9f88aad2c423ebcd61121562f9834187d4.zip
Merging upstream version 115.8.0esr.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'netwerk/streamconv')
-rw-r--r--netwerk/streamconv/converters/nsMultiMixedConv.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/netwerk/streamconv/converters/nsMultiMixedConv.cpp b/netwerk/streamconv/converters/nsMultiMixedConv.cpp
index 54e57e41b4..6b2ec51be4 100644
--- a/netwerk/streamconv/converters/nsMultiMixedConv.cpp
+++ b/netwerk/streamconv/converters/nsMultiMixedConv.cpp
@@ -21,6 +21,7 @@
#include "mozilla/AutoRestore.h"
#include "mozilla/Tokenizer.h"
#include "nsComponentManagerUtils.h"
+#include "mozilla/StaticPrefs_network.h"
using namespace mozilla;
@@ -977,7 +978,8 @@ nsresult nsMultiMixedConv::ProcessHeader() {
nsCOMPtr<nsIHttpChannelInternal> httpInternal =
do_QueryInterface(mChannel);
mResponseHeaderValue.CompressWhitespace();
- if (httpInternal) {
+ if (!StaticPrefs::network_cookie_prevent_set_cookie_from_multipart() &&
+ httpInternal) {
DebugOnly<nsresult> rv = httpInternal->SetCookie(mResponseHeaderValue);
MOZ_ASSERT(NS_SUCCEEDED(rv));
}