summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwolfbeast <mcwerewolf@wolfbeast.com>2020-03-24 21:12:24 +0100
committerwolfbeast <mcwerewolf@wolfbeast.com>2020-03-24 21:12:24 +0100
commita731633d7b50e4ec88a1a4b54d578d1abb3c4b12 (patch)
tree425b3f21095a760b97cf2fef3305f1f32d6c62e3
parentcd2ffb4b8f78caf7ccfe29bfa8e85ea806b7e6b0 (diff)
downloadUXP-a731633d7b50e4ec88a1a4b54d578d1abb3c4b12.tar
UXP-a731633d7b50e4ec88a1a4b54d578d1abb3c4b12.tar.gz
UXP-a731633d7b50e4ec88a1a4b54d578d1abb3c4b12.tar.lz
UXP-a731633d7b50e4ec88a1a4b54d578d1abb3c4b12.tar.xz
UXP-a731633d7b50e4ec88a1a4b54d578d1abb3c4b12.zip
Revert "Issue #1473 - Add `%OS_SLICE%` macro to SSUAO to refine OS info"RELBASE_20200324
This reverts commit 3c8bc3da7cd537680288e8b870c21e1ae789a541.
-rw-r--r--netwerk/protocol/http/UserAgentOverrides.jsm5
1 files changed, 1 insertions, 4 deletions
diff --git a/netwerk/protocol/http/UserAgentOverrides.jsm b/netwerk/protocol/http/UserAgentOverrides.jsm
index aa1325a64..037aa575b 100644
--- a/netwerk/protocol/http/UserAgentOverrides.jsm
+++ b/netwerk/protocol/http/UserAgentOverrides.jsm
@@ -18,9 +18,6 @@ const PREF_OVERRIDES_ENABLED = "general.useragent.site_specific_overrides";
const DEFAULT_UA = Cc["@mozilla.org/network/protocol;1?name=http"]
.getService(Ci.nsIHttpProtocolHandler)
.userAgent;
-const OS_SLICE = Cc["@mozilla.org/network/protocol;1?name=http"]
- .getService(Ci.nsIHttpProtocolHandler)
- .oscpu + ";";
const MAX_OVERRIDE_FOR_HOST_CACHE_SIZE = 250;
XPCOMUtils.defineLazyServiceGetter(this, "ppmm",
@@ -146,7 +143,7 @@ function getUserAgentFromOverride(override)
if (search && replace) {
userAgent = DEFAULT_UA.replace(new RegExp(search, "g"), replace);
} else {
- userAgent = override.replace(/%OS_SLICE%/g, OS_SLICE);
+ userAgent = override;
}
gBuiltUAs.set(override, userAgent);
return userAgent;