- tbb-commits - lists.torproject.org

[tor-browser/tor-browser-78.4.0esr-10.5-1] fixup! Bug 10760: Integrate TorButton to TorBrowser core
by gk＠torproject.org 18 Oct '20

18 Oct '20

commit 38faf8d45d8d991e80982f11bef0d57431bfc4d7 Author: Georg Koppen <gk(a)torproject.org> Date: Sun Oct 18 20:33:50 2020 +0000 fixup! Bug 10760: Integrate TorButton to TorBrowser core --- toolkit/torproject/torbutton | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/toolkit/torproject/torbutton b/toolkit/torproject/torbutton index 0675516fdb00..ad7c0b884586 160000 --- a/toolkit/torproject/torbutton +++ b/toolkit/torproject/torbutton @@ -1 +1 @@ -Subproject commit 0675516fdb00677d5a1f8d8b0f1c9e55246d10de +Subproject commit ad7c0b884586f5d1f3cc8e9223ae806f77ca05af

1 0

[tor-browser-build/master] Move OpenSSL in ChangeLog, tag build2
by sysrqb＠torproject.org 18 Oct '20

18 Oct '20

commit 2a1385c77f8025cea91f013140fd4c6bb53c6bb0 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Sun Oct 18 18:59:50 2020 +0000 Move OpenSSL in ChangeLog, tag build2 --- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 2 +- rbm.conf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index 531c6b4..997646b 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -2,6 +2,7 @@ Tor Browser 10.5a2 -- October 20 2020 * Windows + OS X + Linux * Update Firefox to 78.4.0esr * Update NoScript to 11.1.3 + * Update OpenSSL to 1.1.1h * Update Tor Launcher to 0.2.26 * Translations update * Bug 31767: Avoid using intl.locale.requested preference directly @@ -20,7 +21,6 @@ Tor Browser 10.5a2 -- October 20 2020 * Build System * Windows + OS X + Linux * Update Go to 1.14.10 - * Update OpenSSL to 1.1.1h * Bug 40104: Use our TMPDIR when creating our .mar files [tor-browser-build] * Linux * Bug 40118: Add missing libdrm dev package to firefox container [tor-browser-build] diff --git a/rbm.conf b/rbm.conf index 2617fb8..5fc8843 100644 --- a/rbm.conf +++ b/rbm.conf @@ -25,7 +25,7 @@ buildconf: var: torbrowser_version: '10.5a2' - torbrowser_build: 'build1' + torbrowser_build: 'build2' torbrowser_incremental_from: - 10.5a1 project_name: tor-browser

1 0

[tor-browser-build/master] Release preparations for 10.5a2
by sysrqb＠torproject.org 18 Oct '20

18 Oct '20

commit 40468961309db4dd71a4f6ef4c26f2e273f2dac0 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Sun Oct 18 02:46:56 2020 +0000 Release preparations for 10.5a2 Versions bump and Changelog update --- projects/firefox-langpacks/config | 2 +- projects/firefox/config | 2 +- projects/go/config | 4 +-- projects/openssl/config | 6 ++--- .../tor-browser/Bundle-Data/Docs/ChangeLog.txt | 31 ++++++++++++++++++++++ projects/tor-browser/config | 4 +-- projects/tor-launcher/config | 2 +- rbm.conf | 6 ++--- 8 files changed, 43 insertions(+), 14 deletions(-) diff --git a/projects/firefox-langpacks/config b/projects/firefox-langpacks/config index 34d6fad..17a707a 100644 --- a/projects/firefox-langpacks/config +++ b/projects/firefox-langpacks/config @@ -4,7 +4,7 @@ filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/buil var: ff_version: '[% pc("firefox", "var/firefox_version") %]' - ff_build: build1 + ff_build: build2 input_filename: 'dl-langpack-[% c("var/ff_arch") %]-[% c("version") %]' targets: diff --git a/projects/firefox/config b/projects/firefox/config index a099d45..91c8a44 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -8,7 +8,7 @@ git_submodule: 1 gpg_keyring: torbutton.gpg var: - firefox_platform_version: 78.3.0 + firefox_platform_version: 78.4.0 firefox_version: '[% c("var/firefox_platform_version") %]esr' torbrowser_branch: 10.5 branding_directory: 'browser/branding/alpha' diff --git a/projects/go/config b/projects/go/config index 24ab09a..35cbce6 100644 --- a/projects/go/config +++ b/projects/go/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 1.14.7 +version: 1.14.10 filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' var: @@ -118,7 +118,7 @@ input_files: enable: '[% ! c("var/linux") %]' - URL: 'https://golang.org/dl/go[% c("version") %].src.tar.gz' name: go - sha256sum: 064392433563660c73186991c0a315787688e7c38a561e26647686f89b6c30e3 + sha256sum: 343346686c5372718dbd0a9fd5af422a28a45804e24405e23f8e632eeb55608e - URL: 'https://golang.org/dl/go[% c("var/go14_version") %].src.tar.gz' name: go14 sha256sum: 9947fc705b0b841b5938c48b22dc33e9647ec0752bae66e50278df4f23f64959 diff --git a/projects/openssl/config b/projects/openssl/config index 91b0f1c..45b4fd6 100644 --- a/projects/openssl/config +++ b/projects/openssl/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 1.1.1g +version: 1.1.1h filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' var: @@ -31,6 +31,4 @@ input_files: - name: '[% c("var/compiler") %]' project: '[% c("var/compiler") %]' - URL: 'https://www.openssl.org/source/openssl-[% c("version") %].tar.gz' - sha256sum: ddb04774f1e32f0c49751e21b67216ac87852ceb056b75209af2443400636d46 - - filename: use-SOURCE_DATE_EPOCH.patch - enable: '[% c("var/windows") %]' + sha256sum: 5c9ca8774bd7b03e5784f26ae9e9e6d749c9da2438545077e6b3d755a06595d9 diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index e33a54d..531c6b4 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,34 @@ +Tor Browser 10.5a2 -- October 20 2020 + * Windows + OS X + Linux + * Update Firefox to 78.4.0esr + * Update NoScript to 11.1.3 + * Update Tor Launcher to 0.2.26 + * Translations update + * Bug 31767: Avoid using intl.locale.requested preference directly + * Bug 33954: Consider different approach for Bug 2176 + * Bug 40011: Rename tor-browser-brand.ftl to brand.ftl [torbutton] + * Bug 40012: Fix about:tor not loading some images in 82 [torbutton] + * Bug 40013: End of year 2020 Fundraising campaign [torbutton] + * Bug 40016: Fix onion pattern for LTR locales [torbutton] + * Bug 40139: Update Onboarding icon for 10.0 [tor-browser] + * Bug 40148: Disable Picture-in-Picture until we investigate and possibly fix it [tor-browser] + * Bug 40166: Disable security.certerrors.mitm.auto_enable_enterprise_roots [tor-browser] + * Bug 40192: Backport Mozilla Bug 1658881 [tor-browser] + * Translations update + * Windows + * Bug 40140: Videos stop working with Tor Browser 10.0 on Windows [tor-browser] + * Build System + * Windows + OS X + Linux + * Update Go to 1.14.10 + * Update OpenSSL to 1.1.1h + * Bug 40104: Use our TMPDIR when creating our .mar files [tor-browser-build] + * Linux + * Bug 40118: Add missing libdrm dev package to firefox container [tor-browser-build] + * Windows + * Bug 34360: Bump binutils to 2.35.1 + * Bug 40051: Remove SOURCE_DATE_EPOCH patch [tor-browser-build] + * Bug 40131: Remove unused binutils patches [tor-browser-build] + Tor Browser 10.0.1 -- October 13 2020 * Windows + OS X + Linux * Update NoScript to 11.1.1 diff --git a/projects/tor-browser/config b/projects/tor-browser/config index 8bb1a67..8b201f8 100644 --- a/projects/tor-browser/config +++ b/projects/tor-browser/config @@ -77,9 +77,9 @@ input_files: enable: '[% c("var/snowflake") && ! c("var/android") %]' - filename: Bundle-Data enable: '[% ! c("var/android") %]' - - URL: https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suit… + - URL: https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suit… name: noscript - sha256sum: 3b768fa45f94bed9c58962bd7c0c11bc431e639aeedb2e91c7d8303df5fc84ae + sha256sum: 08543e4a03e0becacd10c3cdbf5eaab1ff35a1648babe6f1522ae335e21de7d4 - filename: 'RelativeLink/start-tor-browser.desktop' enable: '[% c("var/linux") %]' - filename: 'RelativeLink/execdesktop' diff --git a/projects/tor-launcher/config b/projects/tor-launcher/config index f8828db..0c9698a 100644 --- a/projects/tor-launcher/config +++ b/projects/tor-launcher/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 0.2.25 +version: 0.2.26 git_url: https://git.torproject.org/tor-launcher.git git_hash: '[% c("version") %]' gpg_keyring: torbutton.gpg diff --git a/rbm.conf b/rbm.conf index aeb089e..2617fb8 100644 --- a/rbm.conf +++ b/rbm.conf @@ -24,10 +24,10 @@ buildconf: git_signtag_opt: '-s' var: - torbrowser_version: '10.5a1' - torbrowser_build: 'build2' + torbrowser_version: '10.5a2' + torbrowser_build: 'build1' torbrowser_incremental_from: - - 10.0a7 + - 10.5a1 project_name: tor-browser multi_lingual: 0 build_mar: 1

1 0

[Git][tpo/applications/fenix][tor-browser-82.0.0b4-10.0-1] 2 commits: Bug 40073: Use correct branding on About page
by Matthew Finkel 16 Oct '20

16 Oct '20

Matthew Finkel pushed to branch tor-browser-82.0.0b4-10.0-1 at The Tor Project / Applications / fenix Commits: cfb56207 by Matthew Finkel at 2020-10-16T19:13:59+00:00 Bug 40073: Use correct branding on About page - - - - - 77e2f0c7 by Matthew Finkel at 2020-10-16T22:28:11+00:00 Merge branch 'bug_40073_02' into tor-browser-82.0.0b4-10.0-1 - - - - - 5 changed files: - app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsSubMenuAboutRobot.kt - app/src/main/java/org/mozilla/fenix/settings/about/AboutFragment.kt - app/src/main/res/layout/fragment_about.xml - app/src/main/res/values/styles.xml - app/src/main/res/values/torbrowser_strings.xml Changes: ===================================== app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsSubMenuAboutRobot.kt ===================================== @@ -107,8 +107,8 @@ private fun assertVersionNumber() { } private fun assertProductCompany() { - onView(withId(R.id.about_content)) - .check(matches(withText(containsString("Firefox Preview is produced by Mozilla.")))) + onView(withId(R.id.tor_about_content)) + .check(matches(withText(containsString("Firefox Preview is produced by the Tor Project.")))) } private fun assertCurrentTimestamp() { ===================================== app/src/main/java/org/mozilla/fenix/settings/about/AboutFragment.kt ===================================== @@ -17,7 +17,6 @@ import androidx.recyclerview.widget.DividerItemDecoration import kotlinx.android.synthetic.main.fragment_about.* import org.mozilla.fenix.BrowserDirection import org.mozilla.fenix.BuildConfig -import org.mozilla.fenix.Config import org.mozilla.fenix.HomeActivity import org.mozilla.fenix.R import org.mozilla.fenix.components.metrics.Event @@ -50,8 +49,7 @@ class AboutFragment : Fragment(), AboutPageListener { ): View? { val rootView = inflater.inflate(R.layout.fragment_about, container, false) appName = getString(R.string.app_name) - headerAppName = - if (Config.channel.isRelease) getString(R.string.daylight_app_name) else appName + headerAppName = appName activity?.title = getString(R.string.preferences_about, appName) return rootView @@ -117,7 +115,7 @@ class AboutFragment : Fragment(), AboutPageListener { "" } - val content = getString(R.string.about_content, headerAppName) + val content = getString(R.string.tor_about_content, headerAppName) val buildDate = BuildConfig.BUILD_DATE about_text.text = aboutText ===================================== app/src/main/res/layout/fragment_about.xml ===================================== @@ -19,18 +19,32 @@ <ImageView android:id="@+id/wordmark" - android:layout_width="0dp" - android:layout_height="@dimen/about_header_fenix_logo_height" - android:layout_marginStart="@dimen/about_header_icon_margin_start_end" + android:layout_width="75dp" + android:layout_height="75dp" android:layout_marginTop="@dimen/about_header_icon_margin_top" - android:layout_marginEnd="@dimen/about_header_icon_margin_start_end" + android:layout_marginEnd="130dp" android:contentDescription="@string/app_name" android:importantForAccessibility="no" - app:srcCompat="?fenixLogo" - app:layout_constraintEnd_toEndOf="parent" + app:srcCompat="@mipmap/ic_launcher" app:layout_constraintStart_toStartOf="parent" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintTop_toTopOf="parent" /> + + <TextView + android:id="@+id/app_name" + style="@style/Header24TextStyle" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginTop="@dimen/about_header_icon_margin_top" + android:gravity="center_vertical" + android:width="130dp" + android:height="70dp" + android:lines="2" + android:text="@string/app_name" + android:textSize="20sp" + android:lineSpacingMultiplier="1.2" app:layout_constraintTop_toTopOf="parent" - app:layout_constraintWidth_percent="0.75" /> + app:layout_constraintStart_toEndOf="@id/wordmark" /> <TextView android:id="@+id/about_content" @@ -45,7 +59,7 @@ app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/wordmark" app:layout_constraintWidth_percent="0.8" - tools:text="@string/about_content" /> + tools:text="@string/tor_about_content" /> <TextView android:id="@+id/about_text" ===================================== app/src/main/res/values/styles.xml ===================================== @@ -392,6 +392,12 @@ <item name="fontFamily">@font/metropolis_semibold</item> </style> + <style name="Header24TextStyle" parent="TextAppearance.MaterialComponents.Body1"> + <item name="android:textColor">?primaryText</item> + <item name="android:textSize">24sp</item> + <item name="fontFamily">@font/metropolis_semibold</item> + </style> + <style name="Header16TextStyle" parent="TextAppearance.MaterialComponents.Body1"> <item name="android:textColor">?primaryText</item> <item name="android:textSize">16sp</item> ===================================== app/src/main/res/values/torbrowser_strings.xml ===================================== @@ -2,6 +2,9 @@ - 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/. --> <resources> +  + <string name="tor_about_content">%1$s is produced by the Tor Project, a U.S.-based 501(c)(3) nonprofit.</string> +  <string name="preferences_disable_normal_mode">Allow Only Private Browsing Mode</string>  View it on GitLab: https://gitlab.torproject.org/tpo/applications/fenix/-/compare/e8d4affafa17… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/fenix/-/compare/e8d4affafa17… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[tor-browser-build/maint-10.0] Bug 40104: Use our TMPDIR when creating our .mar files
by gk＠torproject.org 16 Oct '20

16 Oct '20

commit 0785a4864f48daea7e38f226384e09a34b17028d Author: Georg Koppen <gk(a)torproject.org> Date: Fri Oct 16 15:46:20 2020 +0000 Bug 40104: Use our TMPDIR when creating our .mar files --- tools/dmg2mar | 1 + tools/update-responses/update_responses | 1 + 2 files changed, 2 insertions(+) diff --git a/tools/dmg2mar b/tools/dmg2mar index 13a4c9e..54bb512 100755 --- a/tools/dmg2mar +++ b/tools/dmg2mar @@ -143,6 +143,7 @@ sub convert_files { unlink $output; local $ENV{MOZ_PRODUCT_VERSION} = $file->{version}; local $ENV{MAR_CHANNEL_ID} = "torbrowser-torproject-$channel"; + local $ENV{TMPDIR} = $tmpdir; (undef, $err, $success) = capture_exec('make_full_update.sh', '-q', $output, "$tmpdir/$appname.app"); exit_error "Error updating $output: $err" unless $success; diff --git a/tools/update-responses/update_responses b/tools/update-responses/update_responses index b07d937..de24235 100755 --- a/tools/update-responses/update_responses +++ b/tools/update-responses/update_responses @@ -232,6 +232,7 @@ sub create_incremental_mar { } local $ENV{MOZ_PRODUCT_VERSION} = $new_version; local $ENV{MAR_CHANNEL_ID} = "torbrowser-torproject-$channel"; + local $ENV{TMPDIR} = $tmpdir; my ($out, $err, $success) = capture_exec('make_incremental_update.sh', $mar_file_path, "$tmpdir/A", "$tmpdir/B"); if (!$success) {

1 0

[tor-browser-build/master] Bug 40104: Use our TMPDIR when creating our .mar files
by sysrqb＠torproject.org 16 Oct '20

16 Oct '20

commit db2bfade24a0e9518d768e7e84e22f9ae42e99f5 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Oct 16 15:46:20 2020 +0000 Bug 40104: Use our TMPDIR when creating our .mar files --- tools/dmg2mar | 1 + tools/update-responses/update_responses | 1 + 2 files changed, 2 insertions(+) diff --git a/tools/dmg2mar b/tools/dmg2mar index 13a4c9e..54bb512 100755 --- a/tools/dmg2mar +++ b/tools/dmg2mar @@ -143,6 +143,7 @@ sub convert_files { unlink $output; local $ENV{MOZ_PRODUCT_VERSION} = $file->{version}; local $ENV{MAR_CHANNEL_ID} = "torbrowser-torproject-$channel"; + local $ENV{TMPDIR} = $tmpdir; (undef, $err, $success) = capture_exec('make_full_update.sh', '-q', $output, "$tmpdir/$appname.app"); exit_error "Error updating $output: $err" unless $success; diff --git a/tools/update-responses/update_responses b/tools/update-responses/update_responses index b07d937..de24235 100755 --- a/tools/update-responses/update_responses +++ b/tools/update-responses/update_responses @@ -232,6 +232,7 @@ sub create_incremental_mar { } local $ENV{MOZ_PRODUCT_VERSION} = $new_version; local $ENV{MAR_CHANNEL_ID} = "torbrowser-torproject-$channel"; + local $ENV{TMPDIR} = $tmpdir; my ($out, $err, $success) = capture_exec('make_incremental_update.sh', $mar_file_path, "$tmpdir/A", "$tmpdir/B"); if (!$success) {

1 0

[tor-browser-build/maint-10.0] Pick up tor-browser -build2
by sysrqb＠torproject.org 16 Oct '20

16 Oct '20

commit cdd071662ca62645e30a29b15315c4b82b14372a Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Fri Oct 16 13:19:52 2020 +0000 Pick up tor-browser -build2 --- projects/firefox/config | 2 +- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 2 ++ rbm.conf | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/projects/firefox/config b/projects/firefox/config index 9d08d8c..2633653 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' filename: 'firefox-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %]' -git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-2-build1' +git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-2-build2' tag_gpg_id: 1 git_url: https://git.torproject.org/tor-browser.git git_submodule: 1 diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index ac85f33..8e7181b 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -4,6 +4,8 @@ Tor Browser 10.0.2 -- October 20 2020 * Update NoScript to 11.1.3 * Bug 40192: Backport Mozilla Bug 1658881 * Translations update + * Linux + * Bug 40193: Add `AT_EMPTY_PATH` definition Tor Browser 10.0.1 -- October 13 2020 * Windows + OS X + Linux diff --git a/rbm.conf b/rbm.conf index 218f8ef..e097cd7 100644 --- a/rbm.conf +++ b/rbm.conf @@ -25,7 +25,7 @@ buildconf: var: torbrowser_version: '10.0.2' - torbrowser_build: 'build1' + torbrowser_build: 'build2' torbrowser_incremental_from: - 10.0 - 10.0.1

1 0

[tor-browser/tor-browser-78.4.0esr-10.0-2] Bug 40193: Add `AT_EMPTY_PATH` definition
by sysrqb＠torproject.org 16 Oct '20

16 Oct '20

commit e01bb643b33ff99dea5ad54f64993abbc187f148 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Oct 16 08:47:05 2020 +0000 Bug 40193: Add `AT_EMPTY_PATH` definition `AT_EMPTY_PATH` comes with glibc 2.14. However, Debian Wheezy, which we still use for building our stable Linux bundles, comes only with glibc 2.13 resulting in an "undeclared-identifier"-error during build time. This problem got introduced by fixing https://bugzilla.mozilla.org/show_bug.cgi?id=1660901. --- security/sandbox/linux/SandboxFilter.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/security/sandbox/linux/SandboxFilter.cpp b/security/sandbox/linux/SandboxFilter.cpp index 1253a5cc2dc1..326aa1c32c65 100644 --- a/security/sandbox/linux/SandboxFilter.cpp +++ b/security/sandbox/linux/SandboxFilter.cpp @@ -73,6 +73,10 @@ using namespace sandbox::bpf_dsl; // Not part of UAPI, but userspace sees it in F_GETFL; see bug 1650751. #define FMODE_NONOTIFY 0x4000000 +#ifndef AT_EMPTY_PATH +# define AT_EMPTY_PATH 0x100 /* Allow empty relative pathname */ +#endif + #ifndef F_LINUX_SPECIFIC_BASE # define F_LINUX_SPECIFIC_BASE 1024 #else

1 0

[tor-browser/tor-browser-78.3.0esr-10.5-1] Bug 1658881 - When failing to create a channel and an image request, make sure to set the image blocking status appropriately. r=tnikkel
by gk＠torproject.org 16 Oct '20

16 Oct '20

commit 884831e7edda9db676e5b2c37fc938cc190f75e9 Author: Emilio Cobos Álvarez <emilio(a)crisal.io> Date: Wed Sep 9 22:58:29 2020 +0000 Bug 1658881 - When failing to create a channel and an image request, make sure to set the image blocking status appropriately. r=tnikkel This is the same status as we do for known no-data protocols here: https://searchfox.org/mozilla-central/rev/ac142717cc067d875e83e4b1316f004f6… This ensures we treat these two cases the same. Differential Revision: https://phabricator.services.mozilla.com/D89382 --- dom/base/nsImageLoadingContent.cpp | 7 ++++++- layout/reftests/image/reftest.list | 1 + layout/reftests/image/unknown-protocol-ref.html | 1 + layout/reftests/image/unknown-protocol.html | 1 + 4 files changed, 9 insertions(+), 1 deletion(-) diff --git a/dom/base/nsImageLoadingContent.cpp b/dom/base/nsImageLoadingContent.cpp index 23b1fd791c1f..85de63bef02d 100644 --- a/dom/base/nsImageLoadingContent.cpp +++ b/dom/base/nsImageLoadingContent.cpp @@ -1207,7 +1207,12 @@ nsresult nsImageLoadingContent::LoadImage(nsIURI* aNewURI, bool aForce, MOZ_ASSERT(!req, "Shouldn't have non-null request here"); // If we don't have a current URI, we might as well store this URI so people // know what we tried (and failed) to load. - if (!mCurrentRequest) mCurrentURI = aNewURI; + if (!mCurrentRequest) { + mCurrentURI = aNewURI; + if (mImageBlockingStatus == nsIContentPolicy::ACCEPT) { + mImageBlockingStatus = nsIContentPolicy::REJECT_REQUEST; + } + } FireEvent(NS_LITERAL_STRING("error")); FireEvent(NS_LITERAL_STRING("loadend")); diff --git a/layout/reftests/image/reftest.list b/layout/reftests/image/reftest.list index a8a91c13ed3a..3c561fe3a7c8 100644 --- a/layout/reftests/image/reftest.list +++ b/layout/reftests/image/reftest.list @@ -69,3 +69,4 @@ random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) == image-srcset-basic-selec pref(dom.image-lazy-loading.enabled,true) == moz-broken-matching-lazy-load.html moz-broken-matching-1-ref.html == img-invalidation-local-transform-1.html img-invalidation-local-transform-1-ref.html +== unknown-protocol.html unknown-protocol-ref.html diff --git a/layout/reftests/image/unknown-protocol-ref.html b/layout/reftests/image/unknown-protocol-ref.html new file mode 100644 index 000000000000..b5bb326eef57 --- /dev/null +++ b/layout/reftests/image/unknown-protocol-ref.html @@ -0,0 +1 @@ +<img src="mailto://foo"> diff --git a/layout/reftests/image/unknown-protocol.html b/layout/reftests/image/unknown-protocol.html new file mode 100644 index 000000000000..ef06881b7bcb --- /dev/null +++ b/layout/reftests/image/unknown-protocol.html @@ -0,0 +1 @@ +<img src="foobar://baz">

1 0

[tor-browser/tor-browser-78.4.0esr-10.0-2] fixup! Bug 10760: Integrate TorButton to TorBrowser core
by gk＠torproject.org 16 Oct '20

16 Oct '20

commit 9633b5c7e832c047de34e1627398a2b7a62bfc3f Author: Georg Koppen <gk(a)torproject.org> Date: Fri Oct 16 06:22:37 2020 +0000 fixup! Bug 10760: Integrate TorButton to TorBrowser core --- toolkit/torproject/torbutton | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/toolkit/torproject/torbutton b/toolkit/torproject/torbutton index ad7c0b884586..e870d1aee4c1 160000 --- a/toolkit/torproject/torbutton +++ b/toolkit/torproject/torbutton @@ -1 +1 @@ -Subproject commit ad7c0b884586f5d1f3cc8e9223ae806f77ca05af +Subproject commit e870d1aee4c1d7591cca867cbc8ba67ac8ed1d55

1 0