roytam1/UXP
1
0
Fork 0
mirror of https://github.com/roytam1/UXP.git synced 2026-05-26 13:58:49 +00:00
Code Issues Projects Releases Wiki Activity

Issue #1505 - Part 3: Make native mode actually native again.

Browse Source
This commit is contained in:
wolfbeast
2020-04-05 16:40:21 +02:00
committed by Roy Tam
parent 11f8f80826
commit 4337a5f1a8
1 changed files with 36 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
netwerk/protocol/http/nsHttpHandler.cpp
+36 -4
View File
@@ -174,6 +174,7 @@ nsHttpHandler::nsHttpHandler()
, mLegacyAppName("Mozilla")
, mLegacyAppVersion("5.0")
, mProduct("Goanna")
, mCompatGeckoEnabled(false)
, mAppBuildID("20200101")
, mCompatFirefoxEnabled(false)
, mCompatFirefoxVersion("68.9")
@@ -292,8 +293,13 @@ nsHttpHandler::Init()
nsHttpChannelAuthProvider::InitializePrefs();
// rv: should have the Firefox/Gecko compatversion for web compatibility
// when in either compatmodes
mMisc.AssignLiteral("rv:");
mMisc += mCompatFirefoxVersion;
if (mCompatGeckoEnabled) {
mMisc += mCompatFirefoxVersion;
} else {
mMisc += MOZILLA_UAVERSION;
}
mCompatGecko.AssignLiteral("Gecko/20100101");
mCompatFirefox.AssignLiteral("Firefox/");
@@ -338,8 +344,12 @@ nsHttpHandler::Init()
do_GetService("@mozilla.org/network/request-context-service;1");
// Goanna slice version
mProductSub.AssignLiteral(MOZILLA_UAVERSION);
if (mCompatGeckoEnabled) {
mProductSub.AssignLiteral(MOZILLA_UAVERSION);
} else {
mProductSub.Assign(mAppBuildID);
}
// In case MOZILLA_UAVERSION is empty for some odd reason...
if (mProductSub.IsEmpty()) {
mProductSub.Assign(mAppBuildID);
}
@@ -934,6 +944,24 @@ nsHttpHandler::PrefsChanged(nsIPrefBranch *prefs, const char *pref)
if (PREF_CHANGED(UA_PREF("compatMode.gecko"))) {
rv = prefs->GetBoolPref(UA_PREF("compatMode.gecko"), &cVar);
mCompatGeckoEnabled = (NS_SUCCEEDED(rv) && cVar);
// Rebuild rv: and Goanna slice version
mMisc.AssignLiteral("rv:");
if (mCompatGeckoEnabled) {
mMisc += mCompatFirefoxVersion;
} else {
mMisc += MOZILLA_UAVERSION;
}
if (mCompatGeckoEnabled) {
mProductSub.AssignLiteral(MOZILLA_UAVERSION);
} else {
mProductSub.Assign(mAppBuildID);
}
// In case MOZILLA_UAVERSION is empty for some odd reason...
if (mProductSub.IsEmpty()) {
mProductSub.Assign(mAppBuildID);
}
mUserAgentIsDirty = true;
}
@@ -952,7 +980,11 @@ nsHttpHandler::PrefsChanged(nsIPrefBranch *prefs, const char *pref)
// rebuild mMisc and compatMode slice
mMisc.AssignLiteral("rv:");
mMisc += mCompatFirefoxVersion;
if (mCompatGeckoEnabled) {
mMisc += mCompatFirefoxVersion;
} else {
mMisc += MOZILLA_UAVERSION;
}
mCompatFirefox.AssignLiteral("Firefox/");
mCompatFirefox += mCompatFirefoxVersion;