wuggy/Dactyloidae
wuggy/Dactyloidae
1
0
Fork 0
mirror of https://repo.dactyloidae.xyz/Dactyloidae/UXP.git synced 2026-10-26 00:57:30 +09:00
Code Issues Projects Releases Packages Wiki Activity

Issue #1473 - Fix building %OS_SLICE% on non-Windows platforms

Browse source
This commit is contained in:
JustOff 2020-03-24 22:56:31 +02:00 • committed by Roy Tam
commit 6aa52af7ac
2 changed files with 22 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

23
netwerk/protocol/http/UserAgentOverrides.jsm
View file

@ -2,6 +2,10 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this * License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#ifdef XP_WIN
#define UA_SPARE_PLATFORM
#endif
"use strict"; "use strict";
this.EXPORTED_SYMBOLS = [ "UserAgentOverrides" ]; this.EXPORTED_SYMBOLS = [ "UserAgentOverrides" ];
@ -18,9 +22,14 @@ const PREF_OVERRIDES_ENABLED = "general.useragent.site_specific_overrides";
const DEFAULT_UA = Cc["@mozilla.org/network/protocol;1?name=http"] const DEFAULT_UA = Cc["@mozilla.org/network/protocol;1?name=http"]
.getService(Ci.nsIHttpProtocolHandler) .getService(Ci.nsIHttpProtocolHandler)
.userAgent; .userAgent;
const OS_SLICE = Cc["@mozilla.org/network/protocol;1?name=http"] const OSCPU = Cc["@mozilla.org/network/protocol;1?name=http"]
.getService(Ci.nsIHttpProtocolHandler) .getService(Ci.nsIHttpProtocolHandler)
.oscpu + ";"; .oscpu;
#ifndef UA_SPARE_PLATFORM
const PLATFORM = Cc["@mozilla.org/network/protocol;1?name=http"]
.getService(Ci.nsIHttpProtocolHandler)
.platform;
#endif
const MAX_OVERRIDE_FOR_HOST_CACHE_SIZE = 250; const MAX_OVERRIDE_FOR_HOST_CACHE_SIZE = 250;
XPCOMUtils.defineLazyServiceGetter(this, "ppmm", XPCOMUtils.defineLazyServiceGetter(this, "ppmm",
@ -37,12 +46,20 @@ var gOverrideFunctions = [
function (aHttpChannel) { return UserAgentOverrides.getOverrideForURI(aHttpChannel.URI); } function (aHttpChannel) { return UserAgentOverrides.getOverrideForURI(aHttpChannel.URI); }
]; ];
var gBuiltUAs = new Map; var gBuiltUAs = new Map;
var gOSSlice;
this.UserAgentOverrides = { this.UserAgentOverrides = {
init: function uao_init() { init: function uao_init() {
if (gInitialized) if (gInitialized)
return; return;
gOSSlice = OSCPU + ";";
#ifndef UA_SPARE_PLATFORM
if (PLATFORM != "") {
gOSSlice = PLATFORM + "; " + gOSSlice;
}
#endif
gPrefBranch = Services.prefs.getBranch("general.useragent.override."); gPrefBranch = Services.prefs.getBranch("general.useragent.override.");
gPrefBranch.addObserver("", buildOverrides, false); gPrefBranch.addObserver("", buildOverrides, false);
@ -151,7 +168,7 @@ function getUserAgentFromOverride(override)
if (search && replace) { if (search && replace) {
userAgent = DEFAULT_UA.replace(new RegExp(search, "g"), replace); userAgent = DEFAULT_UA.replace(new RegExp(search, "g"), replace);
} else { } else {
userAgent = override.replace(/%OS_SLICE%/g, OS_SLICE); userAgent = override.replace(/%OS_SLICE%/g, gOSSlice);
} }
gBuiltUAs.set(override, userAgent); gBuiltUAs.set(override, userAgent);
return userAgent; return userAgent;

4
netwerk/protocol/http/moz.build
View file

@ -99,9 +99,9 @@ IPDL_SOURCES += [
'PHttpChannel.ipdl', 'PHttpChannel.ipdl',
] ]
EXTRA_JS_MODULES += ['UserAgentOverrides.jsm'] EXTRA_JS_MODULES += ['UserAgentUpdates.jsm']
EXTRA_PP_JS_MODULES += ['UserAgentUpdates.jsm'] EXTRA_PP_JS_MODULES += ['UserAgentOverrides.jsm']
include('/ipc/chromium/chromium-config.mozbuild') include('/ipc/chromium/chromium-config.mozbuild')