tbb-commits June 2015

tbb-commits@lists.torproject.org

3 participants
87 discussions

[torbutton/master] Merge remote-tracking branch 'gk/bug_16427'
by mikeperry＠torproject.org 25 Jun '15

25 Jun '15

commit bdf2289fdcf4485a16ade68b51cbd6532ef460b9 Merge: d379c3e 2b9497e Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Jun 24 19:48:03 2015 -0700 Merge remote-tracking branch 'gk/bug_16427' src/install.rdf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

1 0

[torbutton/master] Bug 16200. Wipe cache on New Identity for TBB/FFESR38
by mikeperry＠torproject.org 25 Jun '15

25 Jun '15

commit d37746c1077bf65666c13fed761afba385c3bb07 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Mon Jun 8 00:19:25 2015 -0700 Bug 16200. Wipe cache on New Identity for TBB/FFESR38 (This updates and consolidates offline cache code as well.) --- src/chrome/content/torbutton.js | 30 ++++++++++++++---------------- 1 file changed, 14 insertions(+), 16 deletions(-) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index 3454613..5f4ba5c 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -19,6 +19,8 @@ XPCOMUtils.defineLazyModuleGetter(this, "ConsoleServiceListener", XPCOMUtils.defineLazyModuleGetter(this, "WebConsoleUtils", "resource://gre/modules/devtools/WebConsoleUtils.jsm"); +let { LoadContextInfo } = Cu.import('resource://gre/modules/LoadContextInfo.jsm'); + const k_tb_last_browser_version_pref = "extensions.torbutton.lastBrowserVersion"; const k_tb_browser_update_needed_pref = "extensions.torbutton.updateNeeded"; const k_tb_last_update_check_pref = "extensions.torbutton.lastUpdateCheck"; @@ -1785,30 +1787,26 @@ function torbutton_do_new_identity() { torbutton_log(3, "New Identity: Clearing Offline Cache"); - var cache = Components.classes["@mozilla.org/network/cache-service;1"]. - getService(Components.interfaces.nsICacheService); - try { - cache.evictEntries(Ci.nsICache.STORE_OFFLINE); + for (let contextInfo of [LoadContextInfo.default, LoadContextInfo.private]) { + let appCacheStorage = Services.cache2.appCacheStorage(contextInfo, null); + // The following call (asyncEvictStorage) is actually synchronous, either + // if we have pref "browser.cache.use_new_backend" -> 1 or + // "browser.cache.use_new_backend_temp" -> true, + // then we are using the new cache (cache2) which operates synchronously. + // If we are using the old cache, then the tor-browser.git patch for + // #5715 also makes this synchronous. So we pass a null callback. + appCacheStorage.asyncEvictStorage(null); + } } catch(e) { torbutton_log(5, "Exception on cache clearing: "+e); window.alert("Torbutton: Unexpected error during offline cache clearing: "+e); } - torbutton_log(3, "New Identity: Clearing LocalStorage"); - - try { - Components.utils.import("resource:///modules/offlineAppCache.jsm"); - OfflineAppCacheHelper.clear(); - } catch(e) { - torbutton_log(5, "Exception on localStorage clearing: "+e); - window.alert("Torbutton: Unexpected error during localStorage clearing: "+e); - } - - torbutton_log(3, "New Identity: Clearing Disk Cache"); + torbutton_log(3, "New Identity: Clearing Disk and Memory Caches"); try { - cache.evictEntries(0); + Services.cache2.clear(); } catch(e) { torbutton_log(5, "Exception on cache clearing: "+e); window.alert("Torbutton: Unexpected error during cache clearing: "+e);

1 0

[torbutton/master] Bug 16200: Torbutton changes for ESR 38
by mikeperry＠torproject.org 25 Jun '15

25 Jun '15

commit 699617776da868b4eabf982d23e7c901498905ef Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Mon Jun 22 13:43:43 2015 -0400 Bug 16200: Torbutton changes for ESR 38 Removed old, unused default preference values. --- src/defaults/preferences/preferences.js | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/src/defaults/preferences/preferences.js b/src/defaults/preferences/preferences.js index 4d1dee0..6b4ec0c 100644 --- a/src/defaults/preferences/preferences.js +++ b/src/defaults/preferences/preferences.js @@ -94,11 +94,6 @@ pref("extensions.torbutton.saved.appname_override",""); pref("extensions.torbutton.saved.appversion_override",""); pref("extensions.torbutton.saved.platform_override",""); pref("extensions.torbutton.saved.oscpu_override", ""); -pref("extensions.torbutton.saved.useragent_override", ""); -pref("extensions.torbutton.saved.productsub_override",""); -pref("extensions.torbutton.saved.buildID_override",""); -pref("extensions.torbutton.saved.useragent_vendor", ""); -pref("extensions.torbutton.saved.useragent_vendorSub",""); pref("extensions.torbutton.saved.transparentTor",false); pref("extensions.torbutton.saved.webgl_disabled", false); // network.dns.disablePrefetch is a hidden option. It has no default value: @@ -220,14 +215,6 @@ pref("extensions.torbutton.appversion_override","5.0 (Windows)"); pref("extensions.torbutton.platform_override","Win32"); pref("extensions.torbutton.oscpu_override", "Windows NT 6.1"); -pref("extensions.torbutton.useragent_override", - "Mozilla/5.0 (Windows NT 6.1; rv:17.0) Gecko/20100101 Firefox/17.0"); - -pref("extensions.torbutton.productsub_override","20100101"); -pref("extensions.torbutton.buildID_override","0"); -pref("extensions.torbutton.useragent_vendor", ""); -pref("extensions.torbutton.useragent_vendorSub",""); - pref("extensions.torbutton.prompt_torbrowser", true); pref("extensions.torbutton.confirm_plugins", true); pref("extensions.torbutton.confirm_newnym", true);

1 0

[torbutton/master] Merge remote-tracking branch 'brade/bug16200-02'
by mikeperry＠torproject.org 25 Jun '15

25 Jun '15

commit d379c3e7992d18f5bab152c527f164b53b217ff6 Merge: d37746c 6996177 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Jun 24 19:36:17 2015 -0700 Merge remote-tracking branch 'brade/bug16200-02' src/defaults/preferences/preferences.js | 13 ------------- 1 file changed, 13 deletions(-)

1 0

[tor-browser/tor-browser-38.1.0esr-5.x-1] fixup! TB4: Tor Browser's Firefox preference overrides.
by mikeperry＠torproject.org 25 Jun '15

25 Jun '15

commit e27dde72950d96837684f956949477ef87162313 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Jun 24 19:38:34 2015 -0700 fixup! TB4: Tor Browser's Firefox preference overrides. Bump our useragent for FF38. --- browser/app/profile/000-tor-browser.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index f148f4d..cffb790 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -71,7 +71,7 @@ pref("general.appname.override", "Netscape"); pref("general.appversion.override", "5.0 (Windows)"); pref("general.oscpu.override", "Windows NT 6.1"); pref("general.platform.override", "Win32"); -pref("general.useragent.override", "Mozilla/5.0 (Windows NT 6.1; rv:31.0) Gecko/20100101 Firefox/31.0"); +pref("general.useragent.override", "Mozilla/5.0 (Windows NT 6.1; rv:38.0) Gecko/20100101 Firefox/38.0"); pref("general.productSub.override", "20100101"); pref("general.buildID.override", "20100101"); pref("browser.startup.homepage_override.buildID", "20100101");

1 0

[tor-browser/tor-browser-31.7.0esr-4.5-2] fixup! Bug 12827: Create preference to disable SVG.
by mikeperry＠torproject.org 25 Jun '15

25 Jun '15

commit 612ae46e1344327c495cec13fd756807c22ff826 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Thu Jun 18 13:38:35 2015 -0400 fixup! Bug 12827: Create preference to disable SVG. If an <object> is used to load an SVG from a .xml file, avoid dereferencing null pointers when script elements are created as generic elements (i.e., when svg.in-content.enabled=false). Fixes ticket #16397. --- content/xml/document/src/nsXMLContentSink.cpp | 12 +++++++++--- content/xml/document/src/nsXMLFragmentContentSink.cpp | 4 ++-- dom/xslt/xslt/txMozillaXMLOutput.cpp | 15 ++++++++------- parser/html/nsHtml5TreeOpExecutor.cpp | 2 ++ 4 files changed, 21 insertions(+), 12 deletions(-) diff --git a/content/xml/document/src/nsXMLContentSink.cpp b/content/xml/document/src/nsXMLContentSink.cpp index 104d80a..57ee45a 100644 --- a/content/xml/document/src/nsXMLContentSink.cpp +++ b/content/xml/document/src/nsXMLContentSink.cpp @@ -471,8 +471,10 @@ nsXMLContentSink::CreateElement(const char16_t** aAtts, uint32_t aAttsCount, || aNodeInfo->Equals(nsGkAtoms::script, kNameSpaceID_SVG) ) { nsCOMPtr<nsIScriptElement> sele = do_QueryInterface(content); - sele->SetScriptLineNumber(aLineNumber); - sele->SetCreatorParser(GetParser()); + if (sele) { + sele->SetScriptLineNumber(aLineNumber); + sele->SetCreatorParser(GetParser()); + } mConstrainSize = false; } @@ -554,13 +556,17 @@ nsXMLContentSink::CloseElement(nsIContent* aContent) nsCOMPtr<nsIScriptElement> sele = do_QueryInterface(aContent); if (mPreventScriptExecution) { - sele->PreventExecution(); + if (sele) + sele->PreventExecution(); return NS_OK; } // Always check the clock in nsContentSink right after a script StopDeflecting(); + if (!sele) + return NS_OK; + // Now tell the script that it's ready to go. This may execute the script // or return true, or neither if the script doesn't need executing. bool block = sele->AttemptToExecute(); diff --git a/content/xml/document/src/nsXMLFragmentContentSink.cpp b/content/xml/document/src/nsXMLFragmentContentSink.cpp index 738a769..29dd1a3 100644 --- a/content/xml/document/src/nsXMLFragmentContentSink.cpp +++ b/content/xml/document/src/nsXMLFragmentContentSink.cpp @@ -229,8 +229,8 @@ nsXMLFragmentContentSink::CloseElement(nsIContent* aContent) if (mPreventScriptExecution && aContent->Tag() == nsGkAtoms::script && (aContent->IsHTML() || aContent->IsSVG())) { nsCOMPtr<nsIScriptElement> sele = do_QueryInterface(aContent); - NS_ASSERTION(sele, "script did QI correctly!"); - sele->PreventExecution(); + if (sele) + sele->PreventExecution(); } return NS_OK; } diff --git a/dom/xslt/xslt/txMozillaXMLOutput.cpp b/dom/xslt/xslt/txMozillaXMLOutput.cpp index 6b95345..45b8579 100644 --- a/dom/xslt/xslt/txMozillaXMLOutput.cpp +++ b/dom/xslt/xslt/txMozillaXMLOutput.cpp @@ -299,13 +299,14 @@ txMozillaXMLOutput::endElement() } else if ((ns == kNameSpaceID_XHTML || ns == kNameSpaceID_SVG) && localName == nsGkAtoms::script) { nsCOMPtr<nsIScriptElement> sele = do_QueryInterface(element); - NS_ABORT_IF_FALSE(sele, "script elements need to implement nsIScriptElement"); - bool block = sele->AttemptToExecute(); - // If the act of insertion evaluated the script, we're fine. - // Else, add this script element to the array of loading scripts. - if (block) { - rv = mNotifier->AddScriptElement(sele); - NS_ENSURE_SUCCESS(rv, rv); + if (sele) { + bool block = sele->AttemptToExecute(); + // If the act of insertion evaluated the script, we're fine. + // Else, add this script element to the array of loading scripts. + if (block) { + rv = mNotifier->AddScriptElement(sele); + NS_ENSURE_SUCCESS(rv, rv); + } } } else if (ns == kNameSpaceID_XHTML && (localName == nsGkAtoms::input || diff --git a/parser/html/nsHtml5TreeOpExecutor.cpp b/parser/html/nsHtml5TreeOpExecutor.cpp index 6c52e5f..fb377bd 100644 --- a/parser/html/nsHtml5TreeOpExecutor.cpp +++ b/parser/html/nsHtml5TreeOpExecutor.cpp @@ -636,6 +636,8 @@ nsHtml5TreeOpExecutor::RunScript(nsIContent* aScriptElement) NS_ASSERTION(aScriptElement, "No script to run"); nsCOMPtr<nsIScriptElement> sele = do_QueryInterface(aScriptElement); + if (!sele) + return; if (!mParser) { NS_ASSERTION(sele->IsMalformed(), "Script wasn't marked as malformed.");

1 0

[tor-browser/tor-browser-38.1.0esr-5.x-1] fixup! TB4: Tor Browser's Firefox preference overrides.
by mikeperry＠torproject.org 25 Jun '15

25 Jun '15

commit acccb97ea445f9209e7dce3ba4fae0569a646e12 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Jun 24 17:59:36 2015 -0700 fixup! TB4: Tor Browser's Firefox preference overrides. Disable resource and user timing APIs as per bugs 13024 and 16340. --- browser/app/profile/000-tor-browser.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index d357f64..f148f4d 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -91,6 +91,8 @@ pref("javascript.use_us_english_locale", true); pref("media.video_stats.enabled", false); // Disable device sensors as possible fingerprinting vector (bug 15758) pref("device.sensors.enabled", false); +pref("dom.enable_resource_timing", false); // Bug 13024: To hell with this API +pref("dom.enable_user_timing", false); // Bug 16336: To hell with this API // Third party stuff pref("network.cookie.cookieBehavior", 1);

1 0

[tor-browser/tor-browser-38.1.0esr-5.x-1] fixup! Bug 1517: Reduce precision of time for Javascript.
by mikeperry＠torproject.org 25 Jun '15

25 Jun '15

commit 1dd1d5c72cecfdfbee6b8526553407d84724dbdd Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Jun 24 17:50:31 2015 -0700 fixup! Bug 1517: Reduce precision of time for Javascript. Address worker thread performance.now() and also clip dom highres timestamps at 1ms in other cases (such as requestAnimationFrame()). --- dom/base/nsDOMNavigationTiming.h | 2 +- dom/workers/Performance.cpp | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dom/base/nsDOMNavigationTiming.h b/dom/base/nsDOMNavigationTiming.h index 7ae592c..e610891 100644 --- a/dom/base/nsDOMNavigationTiming.h +++ b/dom/base/nsDOMNavigationTiming.h @@ -91,7 +91,7 @@ public: inline DOMHighResTimeStamp TimeStampToDOMHighRes(mozilla::TimeStamp aStamp) { mozilla::TimeDuration duration = aStamp - mNavigationStartTimeStamp; - return duration.ToMilliseconds(); + return floor(duration.ToMilliseconds()); // Clamp to milliseconds at least } private: diff --git a/dom/workers/Performance.cpp b/dom/workers/Performance.cpp index 366e3ab..8dea08b 100644 --- a/dom/workers/Performance.cpp +++ b/dom/workers/Performance.cpp @@ -34,9 +34,8 @@ Performance::WrapObject(JSContext* aCx) double Performance::Now() const { - TimeDuration duration = - TimeStamp::Now() - mWorkerPrivate->NowBaseTimeStamp(); - return duration.ToMilliseconds(); + TimeDuration duration = TimeStamp::Now() - mWorkerPrivate->NowBaseTimeStamp(); + return floor(duration.ToMilliseconds()/100.0)*100.0; } END_WORKERS_NAMESPACE

1 0

[tor-browser-bundle/master] We are on ESR
by gk＠torproject.org 23 Jun '15

23 Jun '15

commit faa6152ada46c03bac9918dd69fa5646847be2e1 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Jun 23 11:24:12 2015 +0000 We are on ESR --- gitian/versions.nightly | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitian/versions.nightly b/gitian/versions.nightly index 6d69c68..70cfd91 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -40,7 +40,7 @@ GITIAN_TAG=tor-browser-builder-3.x-7 OPENSSL_VER=1.0.1o GMP_VER=5.1.3 -FIREFOX_LANG_VER=38.0.1 #$FIREFOX_VERSION +FIREFOX_LANG_VER=38.0.1esr #$FIREFOX_VERSION FIREFOX_LANG_BUILD=build2 BINUTILS_VER=2.25 GCC_VER=5.1.0

1 0

[tor-browser-bundle/master] Bump nightly versions
by gk＠torproject.org 23 Jun '15

23 Jun '15

commit 19712f39e9ad2051ce3138aecd5640cd9aaa3f78 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Jun 23 11:11:25 2015 +0000 Bump nightly versions Note, we hardcode the Firefox version foe the language packs this time as the branch name of our pre-alpha Tor Browser branch does already contain the ESR version number of the upcoming release. --- gitian/versions.nightly | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/gitian/versions.nightly b/gitian/versions.nightly index 79051b3..6d69c68 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -7,11 +7,11 @@ BUILD_PT_BUNDLES=1 VERIFY_TAGS=0 -FIREFOX_VERSION=31.7.0esr +FIREFOX_VERSION=38.1.0esr TORBROWSER_UPDATE_CHANNEL=default -TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-5.0-2 +TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-5.x-1 TOR_TAG=master TORLAUNCHER_TAG=master TORBUTTON_TAG=master @@ -40,7 +40,7 @@ GITIAN_TAG=tor-browser-builder-3.x-7 OPENSSL_VER=1.0.1o GMP_VER=5.1.3 -FIREFOX_LANG_VER=$FIREFOX_VERSION +FIREFOX_LANG_VER=38.0.1 #$FIREFOX_VERSION FIREFOX_LANG_BUILD=build2 BINUTILS_VER=2.25 GCC_VER=5.1.0 @@ -60,7 +60,7 @@ GO_VER=1.4.2 ## File names for the source packages OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz GMP_PACKAGE=gmp-${GMP_VER}.tar.bz2 -NOSCRIPT_PACKAGE=noscript_security_suite-2.6.9.26-sm+fn+fx.xpi +NOSCRIPT_PACKAGE=noscript_security_suite-2.6.9.27-sm+fn+fx.xpi TOOLCHAIN4_PACKAGE=x86_64-apple-darwin10.tar.xz TOOLCHAIN4_OLD_PACKAGE=multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz OSXSDK_PACKAGE=MacOSX10.7.sdk.tar.gz @@ -89,7 +89,7 @@ OSXSDK_HASH=da77bb0003fcca5ea8c4e8cb2da8828ded750c54afdcac29ec6f3b46ad5e3adf OSXSDK_OLD_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 -NOSCRIPT_HASH=06d9fa6093378682a7fabfc0b2d156dfafcfda749ddd802970ce14d1860e6a3e +NOSCRIPT_HASH=a59a2150a4fa03091afd670d86333b60b6516ccd104bcef918afe99460fb436a MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c ARGPARSE_HASH=ddaf4b0a618335a32b6664d4ae038a1de8fbada3b25033f9021510ed2b3941a4

1 0

← Newer
1
2
3
4
5
6
7
8
9
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

tbb-commits June 2015