diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-23 04:29:10 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-23 04:29:10 +0000 |
| commit | e3cb9707d5a825c871111670200af02af1718195 (patch) | |
| tree | e9b374d6a4dc9990a45e9b61098624f0b722ede1 /toolkit | |
| parent | Adding debian version 125.0.1-2. (diff) | |
| download | firefox-e3cb9707d5a825c871111670200af02af1718195.tar.xz firefox-e3cb9707d5a825c871111670200af02af1718195.zip | |
Merging upstream version 125.0.2.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'toolkit')
7 files changed, 12 insertions, 17 deletions
diff --git a/toolkit/components/antitracking/test/browser/browser_staticPartition_saveAs.js b/toolkit/components/antitracking/test/browser/browser_staticPartition_saveAs.js index daf3234858..b9984829eb 100644 --- a/toolkit/components/antitracking/test/browser/browser_staticPartition_saveAs.js +++ b/toolkit/components/antitracking/test/browser/browser_staticPartition_saveAs.js @@ -102,7 +102,6 @@ add_task(async function testContextMenuSaveImage() { set: [ ["privacy.partition.network_state", networkIsolation], ["privacy.dynamic_firstparty.use_site", partitionPerSite], - ["dom.block_download_insecure", false], ], }); @@ -198,7 +197,6 @@ add_task(async function testContextMenuSaveVideo() { set: [ ["privacy.partition.network_state", networkIsolation], ["privacy.dynamic_firstparty.use_site", partitionPerSite], - ["dom.block_download_insecure", false], ], }); diff --git a/toolkit/components/antitracking/test/browser/file_saveAsPageInfo.html b/toolkit/components/antitracking/test/browser/file_saveAsPageInfo.html index 8f22e911e7..aa3de2a555 100644 --- a/toolkit/components/antitracking/test/browser/file_saveAsPageInfo.html +++ b/toolkit/components/antitracking/test/browser/file_saveAsPageInfo.html @@ -1,6 +1,6 @@ <html> <body> - <img src="https://example.net/browser/toolkit/components/antitracking/test/browser/raptor.jpg" id="image1"> - <video src="https://example.net/browser/toolkit/components/antitracking/test/browser/file_video.ogv" id="video1"> </video> + <img src="http://example.net/browser/toolkit/components/antitracking/test/browser/raptor.jpg" id="image1"> + <video src="http://example.net/browser/toolkit/components/antitracking/test/browser/file_video.ogv" id="video1"> </video> </body> </html> diff --git a/toolkit/components/downloads/test/unit/test_DownloadLegacy.js b/toolkit/components/downloads/test/unit/test_DownloadLegacy.js index 839611ec22..972820f29e 100644 --- a/toolkit/components/downloads/test/unit/test_DownloadLegacy.js +++ b/toolkit/components/downloads/test/unit/test_DownloadLegacy.js @@ -11,8 +11,6 @@ // Execution of common tests -Services.prefs.setBoolPref("dom.block_download_insecure", false); - // This is used in common_test_Download.js // eslint-disable-next-line no-unused-vars var gUseLegacySaver = true; diff --git a/toolkit/components/extensions/test/browser/browser_ext_downloads_referrer.js b/toolkit/components/extensions/test/browser/browser_ext_downloads_referrer.js index 24d52dd8e0..c9e965c1e1 100644 --- a/toolkit/components/extensions/test/browser/browser_ext_downloads_referrer.js +++ b/toolkit/components/extensions/test/browser/browser_ext_downloads_referrer.js @@ -4,8 +4,8 @@ "use strict"; const URL_PATH = "browser/toolkit/components/extensions/test/browser/data"; -const TEST_URL = `https://example.com/${URL_PATH}/test_downloads_referrer.html`; -const DOWNLOAD_URL = `https://example.com/${URL_PATH}/test-download.txt`; +const TEST_URL = `http://example.com/${URL_PATH}/test_downloads_referrer.html`; +const DOWNLOAD_URL = `http://example.com/${URL_PATH}/test-download.txt`; async function triggerSaveAs({ selector }) { const contextMenu = window.document.getElementById("contentAreaContextMenu"); diff --git a/toolkit/components/nimbus/FeatureManifest.yaml b/toolkit/components/nimbus/FeatureManifest.yaml index 190e29d6db..7612ef2dc2 100644 --- a/toolkit/components/nimbus/FeatureManifest.yaml +++ b/toolkit/components/nimbus/FeatureManifest.yaml @@ -429,10 +429,9 @@ urlbar: * Remove the forcast text from the summary text. yelpMinKeywordLength: type: int - fallbackPref: browser.urlbar.yelp.minKeywordLength description: >- - If the length of user's query is less than this value plus - "yelp.showLessFrequentlyCount", Yelp suggestion never be shown. + The minimum prefix length of a Yelp keyword the user must type to + trigger the suggestion. yelpFeatureGate: type: boolean fallbackPref: browser.urlbar.yelp.featureGate diff --git a/toolkit/components/pdfjs/test/browser_pdfjs_octet_stream.js b/toolkit/components/pdfjs/test/browser_pdfjs_octet_stream.js index da630f726c..d2b4fe310f 100644 --- a/toolkit/components/pdfjs/test/browser_pdfjs_octet_stream.js +++ b/toolkit/components/pdfjs/test/browser_pdfjs_octet_stream.js @@ -5,7 +5,7 @@ const TESTROOT = getRootDirectory(gTestPath).replace( "chrome://mochitests/content/", - "https://example.com/" + "http://mochi.test:8888/" ); // Get a ref to the pdf we want to open. diff --git a/toolkit/components/telemetry/Histograms.json b/toolkit/components/telemetry/Histograms.json index 223b96f082..3be0da3295 100644 --- a/toolkit/components/telemetry/Histograms.json +++ b/toolkit/components/telemetry/Histograms.json @@ -12347,14 +12347,14 @@ "n_values": 10, "description": "How often would blocked mixed content be allowed if HSTS upgrades were allowed? 0=display/no-HSTS, 1=display/HSTS, 2=active/no-HSTS, 3=active/HSTS" }, - "INSECURE_DOWNLOADS": { + "MIXED_CONTENT_DOWNLOADS": { "record_in_processes": ["main", "content"], "products": ["firefox"], - "alert_emails": ["seceng-telemetry@mozilla.com", "ckerschb@mozilla.com"], - "bug_numbers": [1877195], - "expires_in_version": "130", + "alert_emails": ["seceng-telemetry@mozilla.com", "sstreich@mozilla.com"], + "bug_numbers": [1646768], + "expires_in_version": "90", "kind": "boolean", - "description": "Accumulates how many downloads are insecure (True = The download is insecure, False= The download is secure)" + "description": "Accumulates how many downloads are mixed-content (True = The download is MixedContent, False= is not MixedContent)" }, "MIXED_CONTENT_IMAGES": { "record_in_processes": ["main", "content"], |