From f8c34e7c0a5d833a42dc515ae79be5b6acc5a9df Mon Sep 17 00:00:00 2001
From: roytam1 <roytam@gmail.com>
Date: Tue, 9 Jul 2024 11:35:15 +0800
Subject: [PATCH] network: follow-up rev 914569c0b (rework)

---
 netwerk/protocol/http/nsHttpHandler.cpp | 24 ++++++++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)

diff --git a/netwerk/protocol/http/nsHttpHandler.cpp b/netwerk/protocol/http/nsHttpHandler.cpp
index 44c66ba32b..d4ea8c6f9a 100644
--- a/netwerk/protocol/http/nsHttpHandler.cpp
+++ b/netwerk/protocol/http/nsHttpHandler.cpp
@@ -356,7 +356,11 @@ nsHttpHandler::Init()
         mProductSub.AssignLiteral(MOZILLA_UAVERSION);
       }
     } else {
-      mProductSub.Assign(mAppBuildID);
+      if (mCompatPlatformEnabled) {
+        mProductSub.Assign(mCompatPlatformVersion);
+      } else {
+        mProductSub.Assign(mAppBuildID);
+      }
     }
     // In case MOZILLA_UAVERSION is empty for some odd reason...
     if (mProductSub.IsEmpty()) {
@@ -990,9 +994,17 @@ nsHttpHandler::PrefsChanged(nsIPrefBranch *prefs, const char *pref)
         }
         
         if (mCompatGeckoEnabled) {
-          mProductSub.AssignLiteral(MOZILLA_UAVERSION);
+          if (mCompatPlatformEnabled) {
+            mProductSub.Assign(mCompatPlatformVersion);
+          } else {
+            mProductSub.AssignLiteral(MOZILLA_UAVERSION);
+          }
         } else {
-          mProductSub.Assign(mAppBuildID);
+          if (mCompatPlatformEnabled) {
+            mProductSub.Assign(mCompatPlatformVersion);
+          } else {
+            mProductSub.Assign(mAppBuildID);
+          }
         }
         // In case MOZILLA_UAVERSION is empty for some odd reason...
         if (mProductSub.IsEmpty()) {
@@ -1019,7 +1031,11 @@ nsHttpHandler::PrefsChanged(nsIPrefBranch *prefs, const char *pref)
         if (mCompatGeckoEnabled) {
           mMisc += mCompatFirefoxVersion;
         } else {
-          mMisc += MOZILLA_UAVERSION;
+          if (mCompatPlatformEnabled) {
+            mMisc += mCompatPlatformVersion;
+          } else {
+            mMisc += MOZILLA_UAVERSION;
+          }
         }
         mCompatFirefox.AssignLiteral("Firefox/");
         mCompatFirefox += mCompatFirefoxVersion;