diff options
Diffstat (limited to 'modules')
-rw-r--r-- | modules/libjar/nsJARChannel.cpp | 7 | ||||
-rw-r--r-- | modules/libmar/sign/mar_sign.c | 1 | ||||
-rw-r--r-- | modules/libmar/src/mar.h | 1 | ||||
-rw-r--r-- | modules/libmar/src/mar_read.c | 22 | ||||
-rw-r--r-- | modules/libpref/init/all.js | 101 |
5 files changed, 71 insertions, 61 deletions
diff --git a/modules/libjar/nsJARChannel.cpp b/modules/libjar/nsJARChannel.cpp index 4b6b78c6d..ee60602da 100644 --- a/modules/libjar/nsJARChannel.cpp +++ b/modules/libjar/nsJARChannel.cpp @@ -22,7 +22,6 @@ #include "nsIFileURL.h" #include "mozilla/Preferences.h" -#include "mozilla/Telemetry.h" #include "nsITabChild.h" #include "private/pprio.h" #include "nsInputStreamPump.h" @@ -791,12 +790,6 @@ nsJARChannel::AsyncOpen(nsIStreamListener *listener, nsISupports *ctx) return NS_ERROR_UNSAFE_CONTENT_TYPE; } - static bool reportedRemoteJAR = false; - if (!reportedRemoteJAR) { - reportedRemoteJAR = true; - Telemetry::Accumulate(Telemetry::REMOTE_JAR_PROTOCOL_USED, 1); - } - // kick off an async download of the base URI... nsCOMPtr<nsIStreamListener> downloader = new MemoryDownloader(this); uint32_t loadFlags = diff --git a/modules/libmar/sign/mar_sign.c b/modules/libmar/sign/mar_sign.c index 84319651d..182f387d9 100644 --- a/modules/libmar/sign/mar_sign.c +++ b/modules/libmar/sign/mar_sign.c @@ -534,6 +534,7 @@ extract_signature(const char *src, uint32_t sigIndex, const char * dest) for (i = 0; i <= sigIndex; i++) { /* Avoid leaking while skipping signatures */ free(extractedSignature); + extractedSignature = NULL; /* skip past the signature algorithm ID */ if (fseeko(fpSrc, sizeof(uint32_t), SEEK_CUR)) { diff --git a/modules/libmar/src/mar.h b/modules/libmar/src/mar.h index 98b454d94..776daf648 100644 --- a/modules/libmar/src/mar.h +++ b/modules/libmar/src/mar.h @@ -48,6 +48,7 @@ typedef struct MarItem_ { struct MarFile_ { FILE *fp; MarItem *item_table[TABLESIZE]; + int item_table_is_valid; }; typedef struct MarFile_ MarFile; diff --git a/modules/libmar/src/mar_read.c b/modules/libmar/src/mar_read.c index 17744cdfc..378eaea88 100644 --- a/modules/libmar/src/mar_read.c +++ b/modules/libmar/src/mar_read.c @@ -114,6 +114,7 @@ static int mar_read_index(MarFile *mar) { uint32_t offset_to_index, size_of_index; /* verify MAR ID */ + fseek(mar->fp, 0, SEEK_SET); if (fread(id, MAR_ID_SIZE, 1, mar->fp) != 1) return -1; if (memcmp(id, MAR_ID, MAR_ID_SIZE) != 0) @@ -160,11 +161,8 @@ static MarFile *mar_fpopen(FILE *fp) } mar->fp = fp; + mar->item_table_is_valid = 0; memset(mar->item_table, 0, sizeof(mar->item_table)); - if (mar_read_index(mar)) { - mar_close(mar); - return NULL; - } return mar; } @@ -490,6 +488,14 @@ const MarItem *mar_find_item(MarFile *mar, const char *name) { uint32_t hash; const MarItem *item; + if (!mar->item_table_is_valid) { + if (mar_read_index(mar)) { + return NULL; + } else { + mar->item_table_is_valid = 1; + } + } + hash = mar_hash_name(name); item = mar->item_table[hash]; @@ -503,6 +509,14 @@ int mar_enum_items(MarFile *mar, MarItemCallback callback, void *closure) { MarItem *item; int i; + if (!mar->item_table_is_valid) { + if (mar_read_index(mar)) { + return -1; + } else { + mar->item_table_is_valid = 1; + } + } + for (i = 0; i < TABLESIZE; ++i) { item = mar->item_table[i]; while (item) { diff --git a/modules/libpref/init/all.js b/modules/libpref/init/all.js index 22668594f..f6a993962 100644 --- a/modules/libpref/init/all.js +++ b/modules/libpref/init/all.js @@ -23,7 +23,7 @@ pref("keyword.enabled", false); pref("general.useragent.locale", "chrome://global/locale/intl.properties"); pref("general.useragent.compatMode.gecko", false); pref("general.useragent.compatMode.firefox", false); -pref("general.useragent.compatMode.version", "52.9"); +pref("general.useragent.compatMode.version", "60.9"); pref("general.useragent.appVersionIsBuildID", false); // This pref exists only for testing purposes. In order to disable all @@ -117,6 +117,9 @@ pref("browser.cache.compression_level", 0); // Don't show "Open with" option on download dialog if true. pref("browser.download.forbid_open_with", false); +// Save download locations as a content preference +pref("browser.download.lastDir.savePerSite", true); + #ifdef XP_WIN // Save internet zone information on downloaded files: // 0 => Never @@ -128,8 +131,6 @@ pref("browser.download.saveZoneInformation", 2); // Whether or not testing features are enabled. pref("dom.quotaManager.testing", false); -// Whether or not indexedDB is enabled. -pref("dom.indexedDB.enabled", true); // Whether or not indexedDB experimental features are enabled. pref("dom.indexedDB.experimental", false); // Enable indexedDB logging. @@ -211,8 +212,8 @@ pref("dom.enable_performance_observer", false); pref("dom.requestIdleCallback.enabled", true); // Enable Intersection Observers -// See WD https://w3c.github.io/IntersectionObserver/ -pref("dom.IntersectionObserver.enabled", false); +// See WD https://www.w3.org/TR/intersection-observer/ +pref("dom.IntersectionObserver.enabled", true); // Whether the Gamepad API is enabled pref("dom.gamepad.enabled", true); @@ -247,6 +248,10 @@ pref("dom.compartment_per_addon", true); // of content viewers to cache based on the amount of available memory. pref("browser.sessionhistory.max_total_viewers", -1); +// Whether to store 'about:newtab' in the session history, disabled by default. +// See https://github.com/MoonchildProductions/UXP/issues/719 +pref("browser.newtabpage.add_to_session_history", false); + pref("ui.use_native_colors", true); pref("ui.click_hold_context_menus", false); // Duration of timeout of incremental search in menus (ms). 0 means infinite. @@ -273,6 +278,9 @@ pref("browser.display.show_image_placeholders", true); pref("browser.display.show_loading_image_placeholder", false); // min font device pixel size at which to turn on high quality pref("browser.display.auto_quality_min_font_size", 20); +// Background color for standalone images; leave empty to use default +// all CSS colors available: named colors, rgb(..), #rrggbb, ... +pref("browser.display.standalone_images.background_color", ""); pref("browser.anchor_color", "#0000EE"); pref("browser.active_color", "#EE0000"); pref("browser.visited_color", "#551A8B"); @@ -354,9 +362,6 @@ pref("media.play-stand-alone", true); pref("media.hardware-video-decoding.enabled", true); pref("media.hardware-video-decoding.force-enabled", false); -#ifdef MOZ_DIRECTSHOW -pref("media.directshow.enabled", true); -#endif #ifdef MOZ_FMP4 pref("media.mp4.enabled", true); // Specifies whether the PDMFactory can create a test decoder that @@ -577,6 +582,10 @@ pref("media.mediasource.webm.enabled", true); #endif pref("media.mediasource.webm.audio.enabled", true); +#ifdef MOZ_AV1 +pref("media.av1.enabled", false); +#endif + // Use new MediaFormatReader architecture for plain ogg. pref("media.flac.enabled", true); pref("media.ogg.flac.enabled", true); @@ -698,6 +707,10 @@ pref("apz.y_skate_size_multiplier", "1.5"); pref("apz.y_stationary_size_multiplier", "1.5"); #endif +#if !defined(MOZ_WIDGET_ANDROID) && !defined(MOZ_WIDGET_UIKIT) +pref("apz.desktop.enabled", false); +#endif + #ifdef XP_MACOSX // Whether to run in native HiDPI mode on machines with "Retina"/HiDPI display; // <= 0 : hidpi mode disabled, display will just use pixel-based upscaling @@ -724,7 +737,7 @@ pref("gfx.perf-warnings.enabled", false); pref("gfx.color_management.mode", 2); pref("gfx.color_management.display_profile", ""); pref("gfx.color_management.rendering_intent", 0); -pref("gfx.color_management.enablev4", false); +pref("gfx.color_management.enablev4", true); pref("gfx.downloadable_fonts.enabled", true); pref("gfx.downloadable_fonts.fallback_delay", 3000); @@ -901,6 +914,7 @@ pref("findbar.highlightAll", false); pref("findbar.modalHighlight", false); pref("findbar.entireword", false); pref("findbar.iteratorTimeout", 100); +pref("findbar.termPerTab", false); // use Mac OS X Appearance panel text smoothing setting when rendering text, disabled by default pref("gfx.use_text_smoothing_setting", false); @@ -919,16 +933,16 @@ pref("toolkit.scrollbox.clickToScroll.scrollDelay", 150); // Telemetry settings. // Server to submit telemetry pings to. -pref("toolkit.telemetry.server", "https://incoming.telemetry.mozilla.org"); +pref("toolkit.telemetry.server", ""); // Telemetry server owner. Please change if you set toolkit.telemetry.server to a different server -pref("toolkit.telemetry.server_owner", "Mozilla"); +pref("toolkit.telemetry.server_owner", ""); // Information page about telemetry (temporary ; will be about:telemetry in the end) -pref("toolkit.telemetry.infoURL", "https://www.mozilla.org/legal/privacy/firefox.html#telemetry"); +pref("toolkit.telemetry.infoURL", ""); // Determines whether full SQL strings are returned when they might contain sensitive info // i.e. dynamically constructed SQL strings or SQL executed by addons against addon DBs pref("toolkit.telemetry.debugSlowSql", false); // Whether to use the unified telemetry behavior, requires a restart. -pref("toolkit.telemetry.unified", true); +pref("toolkit.telemetry.unified", false); // Identity module pref("toolkit.identity.enabled", false); @@ -942,6 +956,9 @@ pref("toolkit.asyncshutdown.log", false); // Enable deprecation warnings. pref("devtools.errorconsole.deprecation_warnings", true); +// Enable performance warnings. +pref("devtools.errorconsole.performance_warnings", true); + // Disable debugging chrome pref("devtools.chrome.enabled", false); @@ -1435,11 +1452,7 @@ pref("network.http.response.timeout", 300); // Limit the absolute number of http connections. // Note: the socket transport service will clamp the number below this if the OS // cannot allocate that many FDs -#ifdef ANDROID pref("network.http.max-connections", 256); -#else -pref("network.http.max-connections", 900); -#endif // If NOT connecting via a proxy, then // a new connection will only be attempted if the number of active persistent @@ -1487,13 +1500,13 @@ pref("network.http.redirection-limit", 20); pref("network.http.accept-encoding", "gzip, deflate"); pref("network.http.accept-encoding.secure", "gzip, deflate, br"); -pref("network.http.pipelining" , false); +pref("network.http.pipelining" , true); pref("network.http.pipelining.ssl" , false); // disable pipelining over SSL pref("network.http.pipelining.abtest", false); pref("network.http.proxy.pipelining", false); // Max number of requests in the pipeline -pref("network.http.pipelining.maxrequests" , 32); +pref("network.http.pipelining.maxrequests" , 16); // An optimistic request is one pipelined when policy might allow a new // connection instead @@ -1580,7 +1593,10 @@ pref("network.http.spdy.default-hpack-buffer", 65536); // 64k // alt-svc allows separation of transport routing from // the origin host without using a proxy. pref("network.http.altsvc.enabled", true); -pref("network.http.altsvc.oe", true); +// Opportunistic encryption use of alt-svc +pref("network.http.altsvc.oe", false); +// Send upgrade-insecure-requests HTTP header? +pref("network.http.upgrade-insecure-requests", false); pref("network.http.diagnostics", false); @@ -2206,6 +2222,11 @@ pref("ui.key.contentAccess", 5); pref("ui.key.menuAccessKeyFocuses", false); // overridden below pref("ui.key.saveLink.shift", true); // true = shift, false = meta +// When true, overrides Windows OS convention to lock content scrolling +// if a contextual menu is open. +// XXX: Only effective on Windows for now! +pref("ui.menu.allow_content_scroll", true); + // Disable page loading activity cursor by default. pref("ui.use_activity_cursor", false); @@ -2420,7 +2441,7 @@ pref("layout.word_select.stop_at_punctuation", true); pref("layout.selection.caret_style", 0); // pref to report CSS errors to the error console -pref("layout.css.report_errors", true); +pref("layout.css.report_errors", false); // Should the :visited selector ever match (otherwise :link matches instead)? pref("layout.css.visited_links_enabled", true); @@ -4596,8 +4617,8 @@ pref("gfx.direct2d.force-enabled", false); pref("layers.prefer-opengl", false); pref("layers.prefer-d3d9", false); -// Disable for now due to bug 1304360 -pref("layers.allow-d3d9-fallback", false); +// Enable fallback if d3d11 can't be used. See bug #1262187 +pref("layers.allow-d3d9-fallback", true); #endif // Copy-on-write canvas @@ -4718,7 +4739,8 @@ pref("dom.vibrator.max_vibrate_ms", 10000); pref("dom.vibrator.max_vibrate_list_len", 128); // Battery API -pref("dom.battery.enabled", true); +// Disabled by default to reduce private data exposure. +pref("dom.battery.enabled", false); // Push @@ -4876,30 +4898,6 @@ pref("dom.browserElement.maxScreenshotDelayMS", 2000); // Whether we should show the placeholder when the element is focused but empty. pref("dom.placeholder.show_on_focus", true); -// VR is disabled by default in release and enabled for nightly and aurora -#ifdef RELEASE_OR_BETA -pref("dom.vr.enabled", false); -#else -pref("dom.vr.enabled", true); -#endif -pref("dom.vr.oculus.enabled", true); -// OSVR device -pref("dom.vr.osvr.enabled", false); -// OpenVR device -pref("dom.vr.openvr.enabled", false); -// Pose prediction reduces latency effects by returning future predicted HMD -// poses to callers of the WebVR API. This currently only has an effect for -// Oculus Rift on SDK 0.8 or greater. It is disabled by default for now due to -// frame uniformity issues with e10s. -pref("dom.vr.poseprediction.enabled", false); -// path to openvr DLL -pref("gfx.vr.openvr-runtime", ""); -// path to OSVR DLLs -pref("gfx.vr.osvr.utilLibPath", ""); -pref("gfx.vr.osvr.commonLibPath", ""); -pref("gfx.vr.osvr.clientLibPath", ""); -pref("gfx.vr.osvr.clientKitLibPath", ""); - // MMS UA Profile settings pref("wap.UAProf.url", ""); pref("wap.UAProf.tagname", "x-wap-profile"); @@ -4958,7 +4956,7 @@ pref("network.captive-portal-service.maxInterval", 1500000); // 25 minutes pref("network.captive-portal-service.backoffFactor", "5.0"); pref("network.captive-portal-service.enabled", false); -pref("captivedetect.canonicalURL", "http://detectportal.firefox.com/success.txt"); +pref("captivedetect.canonicalURL", "http://detectportal.palemoon.org/success.txt"); pref("captivedetect.canonicalContent", "success\n"); pref("captivedetect.maxWaitingTime", 5000); pref("captivedetect.pollingTime", 3000); @@ -5247,7 +5245,7 @@ pref("browser.search.official", true); //pref("media.gmp-manager.url.override", ""); // Update service URL for GMP install/updates: -pref("media.gmp-manager.url", "https://aus5.mozilla.org/update/3/GMP/55.0/%BUILD_ID%/%BUILD_TARGET%/%LOCALE%/%CHANNEL%/%OS_VERSION%/%DISTRIBUTION%/%DISTRIBUTION_VERSION%/update.xml"); +pref("media.gmp-manager.url", "https://aus5.mozilla.org/update/3/GMP/60.0/%BUILD_ID%/%BUILD_TARGET%/%LOCALE%/%CHANNEL%/%OS_VERSION%/%DISTRIBUTION%/%DISTRIBUTION_VERSION%/update.xml"); // When |media.gmp-manager.cert.requireBuiltIn| is true or not specified the // final certificate and all certificates the connection is redirected to before @@ -5387,6 +5385,9 @@ pref("plugins.navigator_hide_disabled_flash", false); // Disable browser frames by default pref("dom.mozBrowserFramesEnabled", false); +// Thick caret when behind CJK characters +pref("layout.cjkthickcaret", true); + // Is support for 'color-adjust' CSS property enabled? pref("layout.css.color-adjust.enabled", true); |