From a7c14e2f29831f4bc5eb18e23e55eb6f7a4e3431 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Mon, 8 Apr 2024 17:12:12 +0200
Subject: Merging upstream version 115.8.0esr.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 netwerk/streamconv/converters/nsMultiMixedConv.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'netwerk/streamconv/converters')

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));
       }
-- 
cgit v1.2.3