- tbb-commits - lists.torproject.org

[tor-browser/tor-browser-38.2.0esr-5.5-1] Bug 1192120 - Fix warnings that show up when opening the downloads window in private browsing mode; r=mconley
by gk＠torproject.org 21 Aug '15

21 Aug '15

commit 470b0fd685c904874254413aebdfb2de84927c47 Author: Ehsan Akhgari <ehsan(a)mozilla.com> Date: Fri Aug 7 00:15:24 2015 -0400 Bug 1192120 - Fix warnings that show up when opening the downloads window in private browsing mode; r=mconley --- browser/components/downloads/DownloadsCommon.jsm | 6 +++--- browser/components/downloads/content/contentAreaDownloadsView.js | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/browser/components/downloads/DownloadsCommon.jsm b/browser/components/downloads/DownloadsCommon.jsm index f658db6..6376069 100644 --- a/browser/components/downloads/DownloadsCommon.jsm +++ b/browser/components/downloads/DownloadsCommon.jsm @@ -239,7 +239,7 @@ this.DownloadsCommon = { * The browser window which owns the download button. */ getData(aWindow) { - if (PrivateBrowsingUtils.isWindowPrivate(aWindow)) { + if (PrivateBrowsingUtils.isContentWindowPrivate(aWindow)) { return PrivateDownloadsData; } else { return DownloadsData; @@ -261,7 +261,7 @@ this.DownloadsCommon = { * the window in question. */ getIndicatorData(aWindow) { - if (PrivateBrowsingUtils.isWindowPrivate(aWindow)) { + if (PrivateBrowsingUtils.isContentWindowPrivate(aWindow)) { return PrivateDownloadsIndicatorData; } else { return DownloadsIndicatorData; @@ -279,7 +279,7 @@ this.DownloadsCommon = { * from the summary. */ getSummary(aWindow, aNumToExclude) { - if (PrivateBrowsingUtils.isWindowPrivate(aWindow)) { + if (PrivateBrowsingUtils.isContentWindowPrivate(aWindow)) { if (this._privateSummary) { return this._privateSummary; } diff --git a/browser/components/downloads/content/contentAreaDownloadsView.js b/browser/components/downloads/content/contentAreaDownloadsView.js index 15bbffd..f841f63 100644 --- a/browser/components/downloads/content/contentAreaDownloadsView.js +++ b/browser/components/downloads/content/contentAreaDownloadsView.js @@ -8,7 +8,7 @@ let ContentAreaDownloadsView = { init() { let view = new DownloadsPlacesView(document.getElementById("downloadsRichListBox")); // Do not display the Places downloads in private windows - if (!PrivateBrowsingUtils.isWindowPrivate(window)) { + if (!PrivateBrowsingUtils.isContentWindowPrivate(window)) { view.place = "place:transition=7&sort=4"; } },

1 0

[tor-browser-bundle/maint-5.0] Bug 16661: check update_responses dependencies in check-prerequisites.sh
by gk＠torproject.org 21 Aug '15

21 Aug '15

commit 9d47b46bc5299c9ba41c49ed589caeda8ae18e5e Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Aug 20 15:40:28 2015 +0200 Bug 16661: check update_responses dependencies in check-prerequisites.sh --- gitian/check-prerequisites.sh | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/gitian/check-prerequisites.sh b/gitian/check-prerequisites.sh index 6111125..93ac158 100755 --- a/gitian/check-prerequisites.sh +++ b/gitian/check-prerequisites.sh @@ -60,6 +60,23 @@ else exit 1 fi +update_responses_pkg="libyaml-perl libfile-slurp-perl libxml-writer-perl libio-captureoutput-perl libfile-which-perl libparallel-forkmanager-perl libxml-libxml-perl libwww-perl" +missing_pkg='' +for pkg in $update_responses_pkg +do + if ! dpkg -s $pkg 2>/dev/null >/dev/null + then + missing_pkg="$missing_pkg $pkg" + fi +done +if [ -n "$missing_pkg" ] +then + echo "You are missing one or more dependencies for the update_responses script" + echo "Please run" + echo " sudo apt-get install $missing_pkg" + exit 1 +fi + if [ ! -f ../../gitian-builder/bin/gbuild ]; then echo "Gitian not found. You need a Gitian checkout in ../../gitian-builder"

1 0

[tor-browser-bundle/master] Bug 16661: check update_responses dependencies in check-prerequisites.sh
by gk＠torproject.org 21 Aug '15

21 Aug '15

commit 569d57637d127d4719cd3de0ba13f5430acddfd4 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Aug 20 15:40:28 2015 +0200 Bug 16661: check update_responses dependencies in check-prerequisites.sh --- gitian/check-prerequisites.sh | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/gitian/check-prerequisites.sh b/gitian/check-prerequisites.sh index 6111125..93ac158 100755 --- a/gitian/check-prerequisites.sh +++ b/gitian/check-prerequisites.sh @@ -60,6 +60,23 @@ else exit 1 fi +update_responses_pkg="libyaml-perl libfile-slurp-perl libxml-writer-perl libio-captureoutput-perl libfile-which-perl libparallel-forkmanager-perl libxml-libxml-perl libwww-perl" +missing_pkg='' +for pkg in $update_responses_pkg +do + if ! dpkg -s $pkg 2>/dev/null >/dev/null + then + missing_pkg="$missing_pkg $pkg" + fi +done +if [ -n "$missing_pkg" ] +then + echo "You are missing one or more dependencies for the update_responses script" + echo "Please run" + echo " sudo apt-get install $missing_pkg" + exit 1 +fi + if [ ! -f ../../gitian-builder/bin/gbuild ]; then echo "Gitian not found. You need a Gitian checkout in ../../gitian-builder"

1 0

[tor-browser/tor-browser-38.2.0esr-5.0-1] fixup! Bug #15502: Isolate blob, mediasource & mediastream URLs to first party
by gk＠torproject.org 20 Aug '15

20 Aug '15

commit 45d52ca216b12a23e83b6fdc9edcff5f49c70152 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Tue Aug 18 11:27:22 2015 -0400 fixup! Bug #15502: Isolate blob, mediasource & mediastream URLs to first party Resurrect a workaround that allows pdf.js to save files. Fixes #16781. --- browser/extensions/pdfjs/content/PdfStreamConverter.jsm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/browser/extensions/pdfjs/content/PdfStreamConverter.jsm b/browser/extensions/pdfjs/content/PdfStreamConverter.jsm index f2ac778..24c2de1 100644 --- a/browser/extensions/pdfjs/content/PdfStreamConverter.jsm +++ b/browser/extensions/pdfjs/content/PdfStreamConverter.jsm @@ -250,6 +250,12 @@ ChromeActions.prototype = { filename = 'document.pdf'; } var blobUri = data.blobUrl ? NetUtil.newURI(data.blobUrl) : originalUri; + var netChannel; + try { + netChannel = NetUtil.newChannel(blobUri); + } catch (e) { + netChannel = NetUtil.newChannel(originalUri); + } var extHelperAppSvc = Cc['@mozilla.org/uriloader/external-helper-app-service;1']. getService(Ci.nsIExternalHelperAppService); @@ -257,7 +263,6 @@ ChromeActions.prototype = { getService(Ci.nsIWindowWatcher).activeWindow; var docIsPrivate = this.isInPrivateBrowsing(); - var netChannel = NetUtil.newChannel(blobUri); if ('nsIPrivateBrowsingChannel' in Ci && netChannel instanceof Ci.nsIPrivateBrowsingChannel) { netChannel.setPrivate(docIsPrivate);

1 0

[tor-browser/tor-browser-38.2.0esr-5.5-1] Merge remote-tracking branch 'pc/bug16781-01' into tor-browser-38.2.0esr-5.5-1
by gk＠torproject.org 20 Aug '15

20 Aug '15

commit 6d15c68167a45cca12ab5e7bcb8781d1de535e80 Merge: c1bde57 6803874 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Aug 20 12:59:57 2015 +0200 Merge remote-tracking branch 'pc/bug16781-01' into tor-browser-38.2.0esr-5.5-1 browser/extensions/pdfjs/content/PdfStreamConverter.jsm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)

1 0

[tor-browser/tor-browser-38.2.0esr-5.5-1] fixup! Bug #15502: Isolate blob, mediasource & mediastream URLs to first party
by gk＠torproject.org 20 Aug '15

20 Aug '15

commit 6803874c258b03f3fdd8cef519b6ef88185c54fa Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Tue Aug 18 11:27:22 2015 -0400 fixup! Bug #15502: Isolate blob, mediasource & mediastream URLs to first party Resurrect a workaround that allows pdf.js to save files. Fixes #16781. --- browser/extensions/pdfjs/content/PdfStreamConverter.jsm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/browser/extensions/pdfjs/content/PdfStreamConverter.jsm b/browser/extensions/pdfjs/content/PdfStreamConverter.jsm index f2ac778..24c2de1 100644 --- a/browser/extensions/pdfjs/content/PdfStreamConverter.jsm +++ b/browser/extensions/pdfjs/content/PdfStreamConverter.jsm @@ -250,6 +250,12 @@ ChromeActions.prototype = { filename = 'document.pdf'; } var blobUri = data.blobUrl ? NetUtil.newURI(data.blobUrl) : originalUri; + var netChannel; + try { + netChannel = NetUtil.newChannel(blobUri); + } catch (e) { + netChannel = NetUtil.newChannel(originalUri); + } var extHelperAppSvc = Cc['@mozilla.org/uriloader/external-helper-app-service;1']. getService(Ci.nsIExternalHelperAppService); @@ -257,7 +263,6 @@ ChromeActions.prototype = { getService(Ci.nsIWindowWatcher).activeWindow; var docIsPrivate = this.isInPrivateBrowsing(); - var netChannel = NetUtil.newChannel(blobUri); if ('nsIPrivateBrowsingChannel' in Ci && netChannel instanceof Ci.nsIPrivateBrowsingChannel) { netChannel.setPrivate(docIsPrivate);

1 0

[tor-browser/tor-browser-38.2.0esr-5.5-1] Merge remote-tracking branch 'gk/bug_16727_55' into tor-browser-38.2.0esr-5.5-1
by gk＠torproject.org 20 Aug '15

20 Aug '15

commit c1bde5752a0116b2b99b061c4a3192ef13d2c100 Merge: dd8b29f 9fd1486 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Aug 20 12:05:29 2015 +0200 Merge remote-tracking branch 'gk/bug_16727_55' into tor-browser-38.2.0esr-5.5-1 browser/app/profile/000-tor-browser.js | 3 +++ 1 file changed, 3 insertions(+)

1 0

[tor-browser/tor-browser-38.2.0esr-5.5-1] fixup! TB4: Tor Browser's Firefox preference overrides.
by gk＠torproject.org 20 Aug '15

20 Aug '15

commit 9fd14868c1c27ffbc1a966fc900d5b22273d3177 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Aug 11 13:00:05 2015 +0000 fixup! TB4: Tor Browser's Firefox preference overrides. This fixes bug 16727: a localized remote page got loaded to handle the health report related transmissions and settings. --- browser/app/profile/000-tor-browser.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index 6bc98d0..20e2f3a 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -55,6 +55,9 @@ pref("extensions.ui.lastCategory", "addons://list/extension"); pref("datareporting.healthreport.service.enabled", false); // Yes, all three of these must be set pref("datareporting.healthreport.uploadEnabled", false); pref("datareporting.policy.dataSubmissionEnabled", false); +// Don't fetch a localized remote page that Tor Browser interacts with, see +// #16727. And, yes, it is "reportUrl" and not "reportURL". +pref("datareporting.healthreport.about.reportUrl", "data:text/plain,"); pref("security.mixed_content.block_active_content", false); // Disable until https://bugzilla.mozilla.org/show_bug.cgi?id=878890 is patched pref("browser.syncPromoViewsLeftMap", "{\"addons\":0, \"passwords\":0, \"bookmarks\":0}"); // Don't promote sync pref("services.sync.engine.prefs", false); // Never sync prefs, addons, or tabs with other browsers

1 0

[tor-browser/tor-browser-38.2.0esr-5.0-1] Merge remote-tracking branch 'gk/bug_16727_50' into tor-browser-38.2.0esr-5.0-1
by gk＠torproject.org 20 Aug '15

20 Aug '15

commit d0fc4f07bbae57b13298be569adceb0bf4bfa455 Merge: 2cf98b3 b21e9d1 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Aug 20 12:03:06 2015 +0200 Merge remote-tracking branch 'gk/bug_16727_50' into tor-browser-38.2.0esr-5.0-1 browser/app/profile/000-tor-browser.js | 3 +++ 1 file changed, 3 insertions(+)

1 0

[tor-browser/tor-browser-38.2.0esr-5.0-1] fixup! TB4: Tor Browser's Firefox preference overrides.
by gk＠torproject.org 20 Aug '15

20 Aug '15

commit b21e9d1f4c199e425700083ef528209b5406dbf1 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Aug 11 13:00:05 2015 +0000 fixup! TB4: Tor Browser's Firefox preference overrides. This fixes bug 16727: a localized remote page got loaded to handle the health report related transmissions and settings. --- browser/app/profile/000-tor-browser.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index 6bc98d0..20e2f3a 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -55,6 +55,9 @@ pref("extensions.ui.lastCategory", "addons://list/extension"); pref("datareporting.healthreport.service.enabled", false); // Yes, all three of these must be set pref("datareporting.healthreport.uploadEnabled", false); pref("datareporting.policy.dataSubmissionEnabled", false); +// Don't fetch a localized remote page that Tor Browser interacts with, see +// #16727. And, yes, it is "reportUrl" and not "reportURL". +pref("datareporting.healthreport.about.reportUrl", "data:text/plain,"); pref("security.mixed_content.block_active_content", false); // Disable until https://bugzilla.mozilla.org/show_bug.cgi?id=878890 is patched pref("browser.syncPromoViewsLeftMap", "{\"addons\":0, \"passwords\":0, \"bookmarks\":0}"); // Don't promote sync pref("services.sync.engine.prefs", false); // Never sync prefs, addons, or tabs with other browsers

1 0