- tbb-commits - lists.torproject.org

[tor-browser/esr24] Bug 701479 - Remove usage of EnumPrintersW to test if port is FILE:. nsDeviceContextSpecWin shouldn't start UI for asking for a filename nor query all possible printers. r=jimm, a=lsblakk
by mikeperry＠torproject.org 29 Aug '14

29 Aug '14

commit 5c995e3f678a3e5a5cf5ec29abf0e811cc1a6707 Author: Oskar Eisemuth <dev_oskar(a)hotmail.com> Date: Tue Jan 28 16:31:20 2014 +0100 Bug 701479 - Remove usage of EnumPrintersW to test if port is FILE:. nsDeviceContextSpecWin shouldn't start UI for asking for a filename nor query all possible printers. r=jimm, a=lsblakk --- widget/windows/nsDeviceContextSpecWin.cpp | 196 ----------------------------- 1 file changed, 196 deletions(-) diff --git a/widget/windows/nsDeviceContextSpecWin.cpp b/widget/windows/nsDeviceContextSpecWin.cpp index 134d74f..1da105f 100644 --- a/widget/windows/nsDeviceContextSpecWin.cpp +++ b/widget/windows/nsDeviceContextSpecWin.cpp @@ -181,189 +181,6 @@ static PRUnichar * GetDefaultPrinterNameFromGlobalPrinters() return ToNewUnicode(printerName); } -//---------------------------------------------------------------- -static nsresult -EnumerateNativePrinters(DWORD aWhichPrinters, LPWSTR aPrinterName, bool& aIsFound, bool& aIsFile) -{ - DWORD dwSizeNeeded = 0; - DWORD dwNumItems = 0; - LPPRINTER_INFO_2W lpInfo = NULL; - - // Get buffer size - if (::EnumPrintersW(aWhichPrinters, NULL, 2, NULL, 0, &dwSizeNeeded, - &dwNumItems)) { - return NS_ERROR_FAILURE; - } - - // allocate memory - lpInfo = (LPPRINTER_INFO_2W) malloc(dwSizeNeeded); - if (!lpInfo) { - return NS_ERROR_OUT_OF_MEMORY; - } - - if (::EnumPrintersW(PRINTER_ENUM_LOCAL, NULL, 2, (LPBYTE)lpInfo, - dwSizeNeeded, &dwSizeNeeded, &dwNumItems) == 0) { - free(lpInfo); - return NS_OK; - } - - for (DWORD i = 0; i < dwNumItems; i++ ) { - if (wcscmp(lpInfo[i].pPrinterName, aPrinterName) == 0) { - aIsFound = true; - aIsFile = wcscmp(lpInfo[i].pPortName, L"FILE:") == 0; - break; - } - } - - free(lpInfo); - return NS_OK; -} - -//---------------------------------------------------------------- -static void -CheckForPrintToFileWithName(LPWSTR aPrinterName, bool& aIsFile) -{ - bool isFound = false; - aIsFile = false; - nsresult rv = EnumerateNativePrinters(PRINTER_ENUM_LOCAL, aPrinterName, isFound, aIsFile); - if (isFound) return; - - rv = EnumerateNativePrinters(PRINTER_ENUM_NETWORK, aPrinterName, isFound, aIsFile); - if (isFound) return; - - rv = EnumerateNativePrinters(PRINTER_ENUM_SHARED, aPrinterName, isFound, aIsFile); - if (isFound) return; - - rv = EnumerateNativePrinters(PRINTER_ENUM_REMOTE, aPrinterName, isFound, aIsFile); - if (isFound) return; -} - -static nsresult -GetFileNameForPrintSettings(nsIPrintSettings* aPS) -{ - // for testing -#ifdef DEBUG_rods - return NS_OK; -#endif - - nsresult rv; - - nsCOMPtr<nsIFilePicker> filePicker = do_CreateInstance("@mozilla.org/filepicker;1", &rv); - NS_ENSURE_SUCCESS(rv, rv); - - nsCOMPtr<nsIStringBundleService> bundleService = - mozilla::services::GetStringBundleService(); - if (!bundleService) - return NS_ERROR_FAILURE; - nsCOMPtr<nsIStringBundle> bundle; - rv = bundleService->CreateBundle(NS_ERROR_GFX_PRINTER_BUNDLE_URL, getter_AddRefs(bundle)); - NS_ENSURE_SUCCESS(rv, rv); - - nsXPIDLString title; - rv = bundle->GetStringFromName(NS_LITERAL_STRING("PrintToFile").get(), getter_Copies(title)); - NS_ENSURE_SUCCESS(rv, rv); - - nsCOMPtr<nsIWindowWatcher> wwatch = - (do_GetService(NS_WINDOWWATCHER_CONTRACTID, &rv)); - NS_ENSURE_SUCCESS(rv, rv); - - nsCOMPtr<nsIDOMWindow> window; - wwatch->GetActiveWindow(getter_AddRefs(window)); - - rv = filePicker->Init(window, title, nsIFilePicker::modeSave); - NS_ENSURE_SUCCESS(rv, rv); - - rv = filePicker->AppendFilters(nsIFilePicker::filterAll); - NS_ENSURE_SUCCESS(rv, rv); - - PRUnichar* fileName; - aPS->GetToFileName(&fileName); - - if (fileName) { - if (*fileName) { - nsAutoString leafName; - nsCOMPtr<nsIFile> file(do_CreateInstance("@mozilla.org/file/local;1")); - if (file) { - rv = file->InitWithPath(nsDependentString(fileName)); - if (NS_SUCCEEDED(rv)) { - file->GetLeafName(leafName); - filePicker->SetDisplayDirectory(file); - } - } - if (!leafName.IsEmpty()) { - rv = filePicker->SetDefaultString(leafName); - } - NS_ENSURE_SUCCESS(rv, rv); - } - nsMemory::Free(fileName); - } - - int16_t dialogResult; - filePicker->Show(&dialogResult); - - if (dialogResult == nsIFilePicker::returnCancel) { - return NS_ERROR_ABORT; - } - - nsCOMPtr<nsIFile> localFile; - rv = filePicker->GetFile(getter_AddRefs(localFile)); - NS_ENSURE_SUCCESS(rv, rv); - - if (dialogResult == nsIFilePicker::returnReplace) { - // be extra safe and only delete when the file is really a file - bool isFile; - rv = localFile->IsFile(&isFile); - if (NS_SUCCEEDED(rv) && isFile) { - rv = localFile->Remove(false /* recursive delete */); - NS_ENSURE_SUCCESS(rv, rv); - } - } - - nsAutoString unicodePath; - rv = localFile->GetPath(unicodePath); - NS_ENSURE_SUCCESS(rv,rv); - - if (unicodePath.IsEmpty()) { - rv = NS_ERROR_ABORT; - } - - if (NS_SUCCEEDED(rv)) aPS->SetToFileName(unicodePath.get()); - - return rv; -} - -//---------------------------------------------------------------------------------- -static nsresult -CheckForPrintToFile(nsIPrintSettings* aPS, LPWSTR aPrinterName, PRUnichar* aUPrinterName) -{ - nsresult rv = NS_OK; - - if (!aPrinterName && !aUPrinterName) return rv; - - bool toFile; - CheckForPrintToFileWithName(aPrinterName?aPrinterName:aUPrinterName, toFile); - // Since the driver wasn't a "Print To File" Driver, check to see - // if the name of the file has been set to the special "FILE:" - if (!toFile) { - nsXPIDLString toFileName; - aPS->GetToFileName(getter_Copies(toFileName)); - if (toFileName) { - if (*toFileName) { - if (toFileName.EqualsLiteral("FILE:")) { - // this skips the setting of the "print to file" info below - // which we don't want to do. - return NS_OK; - } - } - } - } - aPS->SetPrintToFile(toFile); - if (toFile) { - rv = GetFileNameForPrintSettings(aPS); - } - return rv; -} - //---------------------------------------------------------------------------------- NS_IMETHODIMP nsDeviceContextSpecWin::Init(nsIWidget* aWidget, nsIPrintSettings* aPrintSettings, @@ -398,15 +215,6 @@ NS_IMETHODIMP nsDeviceContextSpecWin::Init(nsIWidget* aWidget, SetDriverName(driverName); SetDevMode(devMode); - if (!aIsPrintPreview) { - rv = CheckForPrintToFile(mPrintSettings, deviceName, nullptr); - if (NS_FAILED(rv)) { - nsCRT::free(deviceName); - nsCRT::free(driverName); - return NS_ERROR_FAILURE; - } - } - // clean up nsCRT::free(deviceName); nsCRT::free(driverName); @@ -437,10 +245,6 @@ NS_IMETHODIMP nsDeviceContextSpecWin::Init(nsIWidget* aWidget, NS_ASSERTION(printerName, "We have to have a printer name"); if (!printerName || !*printerName) return rv; - if (!aIsPrintPreview) { - CheckForPrintToFile(mPrintSettings, nullptr, printerName); - } - return GetDataFromPrinter(printerName, mPrintSettings); }

1 0

[tor-browser/esr24] Automated checkin: version bump for firefox 24.7.0esr release. DONTBUILD CLOSED TREE a=release
by mikeperry＠torproject.org 29 Aug '14

29 Aug '14

commit 5a45b0d0ddb1c96ca2ec0ce16f7d616d390aec3f Author: ffxbld <none@none> Date: Mon Jul 14 18:28:02 2014 -0400 Automated checkin: version bump for firefox 24.7.0esr release. DONTBUILD CLOSED TREE a=release --- browser/config/version.txt | 2 +- config/milestone.txt | 2 +- js/src/config/milestone.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/browser/config/version.txt b/browser/config/version.txt index 60f1860..98b82b8 100644 --- a/browser/config/version.txt +++ b/browser/config/version.txt @@ -1 +1 @@ -24.6.0esrpre +24.7.0esrpre diff --git a/config/milestone.txt b/config/milestone.txt index 71e3ef9..c293ee8 100644 --- a/config/milestone.txt +++ b/config/milestone.txt @@ -10,4 +10,4 @@ # hardcoded milestones in the tree from these two files. #-------------------------------------------------------- -24.6.0 +24.7.0esrpre diff --git a/js/src/config/milestone.txt b/js/src/config/milestone.txt index 71e3ef9..c293ee8 100644 --- a/js/src/config/milestone.txt +++ b/js/src/config/milestone.txt @@ -10,4 +10,4 @@ # hardcoded milestones in the tree from these two files. #-------------------------------------------------------- -24.6.0 +24.7.0esrpre

1 0

[tor-browser/esr24] No bug, Automated HSTS preload list update from host bld-linux64-spot-344 - a=hsts-update
by mikeperry＠torproject.org 29 Aug '14

29 Aug '14

commit 820ecd737f245717a8a39410ab978016aaf314ab Author: ffxbld <none@none> Date: Sat Jul 12 03:11:41 2014 -0700 No bug, Automated HSTS preload list update from host bld-linux64-spot-344 - a=hsts-update --- security/manager/boot/src/nsSTSPreloadList.errors | 11 ++++++++--- security/manager/boot/src/nsSTSPreloadList.inc | 12 +++++++----- 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/security/manager/boot/src/nsSTSPreloadList.errors b/security/manager/boot/src/nsSTSPreloadList.errors index dbd20ab..90da6bf 100644 --- a/security/manager/boot/src/nsSTSPreloadList.errors +++ b/security/manager/boot/src/nsSTSPreloadList.errors @@ -1,7 +1,6 @@ admin.google.com: did not receive HSTS header adsfund.org: could not connect to host airbnb.com: did not receive HSTS header -anycoin.me: did not receive HSTS header api.lookout.com: could not connect to host api.mega.co.nz: could not connect to host api.recurly.com: did not receive HSTS header @@ -24,6 +23,7 @@ checkout.google.com: did not receive HSTS header chrome-devtools-frontend.appspot.com: did not receive HSTS header chrome.google.com: did not receive HSTS header cloud.google.com: did not receive HSTS header +code-poets.co.uk: did not receive HSTS header code.google.com: did not receive HSTS header codereview.chromium.org: did not receive HSTS header crate.io: did not receive HSTS header @@ -36,6 +36,7 @@ dl.google.com: did not receive HSTS header docs.google.com: did not receive HSTS header donmez.ws: could not connect to host drive.google.com: did not receive HSTS header +dropbox.com: max-age too low: 2592000 dropcam.com: did not receive HSTS header edmodo.com: did not receive HSTS header email.lookout.com: could not connect to host @@ -57,7 +58,6 @@ groups.google.com: did not receive HSTS header haste.ch: could not connect to host history.google.com: did not receive HSTS header hostedtalkgadget.google.com: did not receive HSTS header -id.atlassian.com: did not receive HSTS header in.xero.com: max-age too low: 3600 intercom.io: did not receive HSTS header iop.intuit.com: max-age too low: 86400 @@ -84,8 +84,10 @@ nexth.us: could not connect to host noexpect.org: could not connect to host openshift.redhat.com: did not receive HSTS header ottospora.nl: could not connect to host +passwordbox.com: did not receive HSTS header paypal.com: max-age too low: 14400 payroll.xero.com: max-age too low: 3600 +piratenlogin.de: did not receive HSTS header platform.lookout.com: could not connect to host play.google.com: did not receive HSTS header prodpad.com: did not receive HSTS header @@ -99,8 +101,10 @@ security.google.com: did not receive HSTS header semenkovich.com: did not receive HSTS header serverdensity.io: did not receive HSTS header shops.neonisi.com: could not connect to host +silentcircle.com: did not receive HSTS header silentcircle.org: could not connect to host simon.butcher.name: max-age too low: 2629743 +simple.com: did not receive HSTS header sites.google.com: did not receive HSTS header sol.io: could not connect to host souyar.de: could not connect to host @@ -110,7 +114,7 @@ spreadsheets.google.com: did not receive HSTS header square.com: did not receive HSTS header ssl.google-analytics.com: did not receive HSTS header ssl.panoramio.com: did not receive HSTS header -stocktrade.de: did not receive HSTS header +stocktrade.de: could not connect to host sunshinepress.org: could not connect to host surfeasy.com: did not receive HSTS header talk.google.com: did not receive HSTS header @@ -122,6 +126,7 @@ webmail.mayfirst.org: did not receive HSTS header whonix.org: did not receive HSTS header www.cueup.com: did not receive HSTS header www.developer.mydigipass.com: could not connect to host +www.dropbox.com: max-age too low: 2592000 www.elanex.biz: did not receive HSTS header www.gmail.com: did not receive HSTS header www.googlemail.com: did not receive HSTS header diff --git a/security/manager/boot/src/nsSTSPreloadList.inc b/security/manager/boot/src/nsSTSPreloadList.inc index 8e1a1aa..dd480ac 100644 --- a/security/manager/boot/src/nsSTSPreloadList.inc +++ b/security/manager/boot/src/nsSTSPreloadList.inc @@ -8,7 +8,7 @@ /*****************************************************************************/ #include "mozilla/StandardInteger.h" -const PRTime gPreloadListExpirationTime = INT64_C(1414231532587000); +const PRTime gPreloadListExpirationTime = INT64_C(1416045947439000); class nsSTSPreload { @@ -18,12 +18,14 @@ class nsSTSPreload }; static const nsSTSPreload kSTSPreloadList[] = { + { "accounts.firefox.com", true }, { "accounts.google.com", true }, { "aclu.org", false }, { "activiti.alfresco.com", false }, { "adsfund.org", true }, { "aladdinschools.appspot.com", false }, { "alpha.irccloud.com", false }, + { "anycoin.me", true }, { "api.intercom.io", false }, { "api.simple.com", false }, { "api.xero.com", false }, @@ -94,6 +96,7 @@ static const nsSTSPreload kSTSPreloadList[] = { { "haste.ch", true }, { "heha.co", true }, { "howrandom.org", true }, + { "id.atlassian.com", true }, { "id.mayfirst.org", false }, { "imouto.my", false }, { "inertianetworks.com", true }, @@ -153,16 +156,15 @@ static const nsSTSPreload kSTSPreloadList[] = { { "passport.yandex.ru", false }, { "passport.yandex.ua", false }, { "passwd.io", true }, - { "passwordbox.com", false }, { "paste.linode.com", false }, { "pastebin.linode.com", false }, { "pay.gigahost.dk", true }, { "paymill.com", true }, { "paymill.de", false }, - { "piratenlogin.de", true }, { "pixi.me", true }, { "plus.google.com", false }, { "plus.sandbox.google.com", false }, + { "portal.tirol.gv.at", true }, { "publications.qld.gov.au", false }, { "pult.co", true }, { "pypi.python.org", true }, @@ -176,9 +178,7 @@ static const nsSTSPreload kSTSPreloadList[] = { { "securityheaders.com", true }, { "seifried.org", true }, { "shodan.io", true }, - { "silentcircle.com", false }, { "simbolo.co.uk", false }, - { "simple.com", false }, { "skydrive.live.com", false }, { "squareup.com", false }, { "stage.wepay.com", false }, @@ -216,6 +216,7 @@ static const nsSTSPreload kSTSPreloadList[] = { { "wf-training-master.appspot.com", true }, { "wf-trial-hrd.appspot.com", true }, { "wiki.python.org", true }, + { "wildbee.org", true }, { "wiz.biz", true }, { "writeapp.me", false }, { "www.aclu.org", false }, @@ -253,5 +254,6 @@ static const nsSTSPreload kSTSPreloadList[] = { { "www.wepay.com", false }, { "www.zenpayroll.com", false }, { "xbrlsuccess.appspot.com", true }, + { "z.ai", true }, { "zenpayroll.com", false }, };

1 0

[tor-browser/esr24] Bug 1027287 - Prevent non-local network connection to aus when enabling app update in add-ons mgr hotfix test. r=mossop, a=test-only
by mikeperry＠torproject.org 29 Aug '14

29 Aug '14

commit 299b11d6822eec6b7271950b0796d022c4226dde Author: Robert Strong <robert.bugzilla(a)gmail.com> Date: Mon Jul 7 12:49:21 2014 -0700 Bug 1027287 - Prevent non-local network connection to aus when enabling app update in add-ons mgr hotfix test. r=mossop, a=test-only --HG-- extra : rebase_source : 594235cd317b0261e436da3ac5ab8166a754df8a --- toolkit/mozapps/extensions/test/browser/browser_hotfix.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/toolkit/mozapps/extensions/test/browser/browser_hotfix.js b/toolkit/mozapps/extensions/test/browser/browser_hotfix.js index ff28889..80f9240 100644 --- a/toolkit/mozapps/extensions/test/browser/browser_hotfix.js +++ b/toolkit/mozapps/extensions/test/browser/browser_hotfix.js @@ -12,6 +12,7 @@ const PREF_INSTALL_REQUIREBUILTINCERTS = "extensions.install.requireBuiltInCerts const PREF_UPDATE_REQUIREBUILTINCERTS = "extensions.update.requireBuiltInCerts"; const PREF_APP_UPDATE_ENABLED = "app.update.enabled"; +const PREF_APP_UPDATE_URL = "app.update.url"; const HOTFIX_ID = "hotfix(a)tests.mozilla.org"; @@ -60,6 +61,8 @@ var FailedInstallListener = { function test() { waitForExplicitFinish(); + var oldAusUrl = Services.prefs.getDefaultBranch(null).getCharPref(PREF_APP_UPDATE_URL); + Services.prefs.getDefaultBranch(null).setCharPref(PREF_APP_UPDATE_URL, TESTROOT + "ausdummy.xml"); Services.prefs.setBoolPref(PREF_APP_UPDATE_ENABLED, true); Services.prefs.setBoolPref(PREF_INSTALL_REQUIREBUILTINCERTS, false); Services.prefs.setBoolPref(PREF_UPDATE_REQUIREBUILTINCERTS, false); @@ -69,6 +72,7 @@ function test() { registerCleanupFunction(function() { Services.prefs.setBoolPref(PREF_APP_UPDATE_ENABLED, false); + Services.prefs.getDefaultBranch(null).setCharPref(PREF_APP_UPDATE_URL, oldAusUrl); Services.prefs.clearUserPref(PREF_EM_HOTFIX_ID); Services.prefs.setCharPref(PREF_EM_HOTFIX_URL, oldURL); Services.prefs.clearUserPref(PREF_INSTALL_REQUIREBUILTINCERTS);

1 0

[tor-browser/esr24] Bug 1027268 - Remove unnecessary timeout from test_bug391747.html to fix intermittent failures. r=mats, a=test-only
by mikeperry＠torproject.org 29 Aug '14

29 Aug '14

commit 4f957865f2d633c84daf21817ff813da581a7394 Author: Martijn Wargers <mwargers(a)mozilla.com> Date: Tue Jul 1 16:26:36 2014 +0200 Bug 1027268 - Remove unnecessary timeout from test_bug391747.html to fix intermittent failures. r=mats, a=test-only --- layout/generic/test/test_bug391747.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/layout/generic/test/test_bug391747.html b/layout/generic/test/test_bug391747.html index 0d3a9af..3933601 100644 --- a/layout/generic/test/test_bug391747.html +++ b/layout/generic/test/test_bug391747.html @@ -39,7 +39,7 @@ function boom_391747() { SimpleTest.finish(); } -setTimeout(boom_391747,400) +addLoadEvent(boom_391747); SimpleTest.waitForExplicitFinish() </script>

1 0

[tor-browser/esr24] Bug 1018234 - Reference count fontFaces. r=jfkthame, a=sledru
by mikeperry＠torproject.org 29 Aug '14

29 Aug '14

commit 1d07beef613496ed0768603fc401c4b1444400e6 Author: James Kitchener <jkitch.bug(a)gmail.com> Date: Wed Jun 25 10:12:31 2014 +0100 Bug 1018234 - Reference count fontFaces. r=jfkthame, a=sledru --- gfx/thebes/gfxDWriteFontList.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gfx/thebes/gfxDWriteFontList.cpp b/gfx/thebes/gfxDWriteFontList.cpp index bef515f..8df648f 100644 --- a/gfx/thebes/gfxDWriteFontList.cpp +++ b/gfx/thebes/gfxDWriteFontList.cpp @@ -350,7 +350,7 @@ public: } private: - IDWriteFontFace *mFontFace; + nsRefPtr<IDWriteFontFace> mFontFace; void *mContext; };

1 0

[tor-browser/esr24] Bug 1033340 - remove use of API not present on ESR 24. a=morebustage, bag=brownpaper.
by mikeperry＠torproject.org 29 Aug '14

29 Aug '14

commit 89c62704f293dc6ec816b936c634046c2c11bc5f Author: Gervase Markham <gerv(a)gerv.net> Date: Thu Jul 3 17:25:58 2014 +0100 Bug 1033340 - remove use of API not present on ESR 24. a=morebustage, bag=brownpaper. --- netwerk/test/unit/test_psl.js | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/netwerk/test/unit/test_psl.js b/netwerk/test/unit/test_psl.js index 251ffa6..91124ea 100644 --- a/netwerk/test/unit/test_psl.js +++ b/netwerk/test/unit/test_psl.js @@ -4,8 +4,6 @@ var etld = Cc["@mozilla.org/network/effective-tld-service;1"] var idna = Cc["@mozilla.org/network/idn-service;1"] .getService(Ci.nsIIDNService); -var Cr = Components.results; - function run_test() { var file = do_get_file("data/test_psl.txt"); @@ -23,8 +21,8 @@ function checkPublicSuffix(host, expectedSuffix) var actualSuffix = null; try { actualSuffix = etld.getBaseDomainFromHost(host); - } catch (e if e.result == Cr.NS_ERROR_INSUFFICIENT_DOMAIN_LEVELS || - e.result == Cr.NS_ERROR_ILLEGAL_VALUE) { + } catch (e if e.name == "NS_ERROR_INSUFFICIENT_DOMAIN_LEVELS" || + e.name == "NS_ERROR_ILLEGAL_VALUE") { } // The EffectiveTLDService always gives back punycoded labels. // The test suite wants to get back what it put in.

1 0

[tor-browser/esr24] No bug, Automated blocklist update from host b-linux64-ix-0011 - a=blocklist-update
by mikeperry＠torproject.org 29 Aug '14

29 Aug '14

commit 949aaf809a1756d39b87dc5d2a483246ce301a86 Author: ffxbld <none@none> Date: Sat Jun 28 03:10:27 2014 -0700 No bug, Automated blocklist update from host b-linux64-ix-0011 - a=blocklist-update --- browser/app/blocklist.xml | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/browser/app/blocklist.xml b/browser/app/blocklist.xml index 87367d7..225701e 100644 --- a/browser/app/blocklist.xml +++ b/browser/app/blocklist.xml @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<blocklist xmlns="http://www.mozilla.org/2006/addons-blocklist" lastupdate="1403216209000"> +<blocklist xmlns="http://www.mozilla.org/2006/addons-blocklist" lastupdate="1403823002000"> <emItems> <emItem blockID="i454" id="sqlmoz(a)facebook.com"> <versionRange minVersion="0" maxVersion="*" severity="3"> @@ -193,6 +193,12 @@ <prefs> </prefs> </emItem> + <emItem blockID="i77" id="{fa277cfc-1d75-4949-a1f9-4ac8e41b2dfd}"> + <versionRange minVersion="0" maxVersion="*"> + </versionRange> + <prefs> + </prefs> + </emItem> <emItem blockID="i40" id="{28387537-e3f9-4ed7-860c-11e69af4a8a0}"> <versionRange minVersion="0.1" maxVersion="4.3.1.00" severity="1"> </versionRange> @@ -244,10 +250,12 @@ <prefs> </prefs> </emItem> - <emItem blockID="i77" id="{fa277cfc-1d75-4949-a1f9-4ac8e41b2dfd}"> - <versionRange minVersion="0" maxVersion="*"> + <emItem blockID="i630" id="webbooster(a)iminent.com"> + <versionRange minVersion="0" maxVersion="*" severity="1"> </versionRange> <prefs> + <pref>browser.startup.homepage</pref> + <pref>browser.search.defaultenginename</pref> </prefs> </emItem> <emItem blockID="i174" id="info(a)thebflix.com"> @@ -571,6 +579,14 @@ <prefs> </prefs> </emItem> + <emItem blockID="i628" id="ffxtlbr(a)iminent.com"> + <versionRange minVersion="0" maxVersion="*" severity="1"> + </versionRange> + <prefs> + <pref>browser.startup.homepage</pref> + <pref>browser.search.defaultenginename</pref> + </prefs> + </emItem> <emItem blockID="i228" id="crossriderapp5060(a)crossrider.com"> <versionRange minVersion="0" maxVersion="*" severity="1"> </versionRange>

1 0

[tor-browser/esr24] Bug 1033340 - port forward PSL test changes also, to try and get rid of xpcshell PSL bustage. a=bustage.
by mikeperry＠torproject.org 29 Aug '14

29 Aug '14

commit 994856d33e0338cb0378eeca454a6bca428acef7 Author: Gervase Markham <gerv(a)gerv.net> Date: Thu Jul 3 15:22:34 2014 +0100 Bug 1033340 - port forward PSL test changes also, to try and get rid of xpcshell PSL bustage. a=bustage. --- netwerk/test/unit/data/test_psl.txt | 32 ++++++++++++++++++++++++++------ netwerk/test/unit/test_psl.js | 20 ++++++++++++++------ 2 files changed, 40 insertions(+), 12 deletions(-) diff --git a/netwerk/test/unit/data/test_psl.txt b/netwerk/test/unit/data/test_psl.txt index 5a75831..35c8ccf 100644 --- a/netwerk/test/unit/data/test_psl.txt +++ b/netwerk/test/unit/data/test_psl.txt @@ -60,12 +60,12 @@ checkPublicSuffix('a.b.c.kobe.jp', 'b.c.kobe.jp'); checkPublicSuffix('city.kobe.jp', 'city.kobe.jp'); checkPublicSuffix('www.city.kobe.jp', 'city.kobe.jp'); // TLD with a wildcard rule and exceptions. -checkPublicSuffix('om', null); -checkPublicSuffix('test.om', null); -checkPublicSuffix('b.test.om', 'b.test.om'); -checkPublicSuffix('a.b.test.om', 'b.test.om'); -checkPublicSuffix('songfest.om', 'songfest.om'); -checkPublicSuffix('www.songfest.om', 'songfest.om'); +checkPublicSuffix('ck', null); +checkPublicSuffix('test.ck', null); +checkPublicSuffix('b.test.ck', 'b.test.ck'); +checkPublicSuffix('a.b.test.ck', 'b.test.ck'); +checkPublicSuffix('www.ck', 'www.ck'); +checkPublicSuffix('www.www.ck', 'www.ck'); // US K12. checkPublicSuffix('us', null); checkPublicSuffix('test.us', 'test.us'); @@ -76,3 +76,23 @@ checkPublicSuffix('www.test.ak.us', 'test.ak.us'); checkPublicSuffix('k12.ak.us', null); checkPublicSuffix('test.k12.ak.us', 'test.k12.ak.us'); checkPublicSuffix('www.test.k12.ak.us', 'test.k12.ak.us'); +// IDN labels. +checkPublicSuffix('食狮.com.cn', '食狮.com.cn'); +checkPublicSuffix('食狮.公司.cn', '食狮.公司.cn'); +checkPublicSuffix('www.食狮.公司.cn', '食狮.公司.cn'); +checkPublicSuffix('shishi.公司.cn', 'shishi.公司.cn'); +checkPublicSuffix('公司.cn', null); +checkPublicSuffix('食狮.中国', '食狮.中国'); +checkPublicSuffix('www.食狮.中国', '食狮.中国'); +checkPublicSuffix('shishi.中国', 'shishi.中国'); +checkPublicSuffix('中国', null); +// Same as above, but punycoded. +checkPublicSuffix('xn--85x722f.com.cn', 'xn--85x722f.com.cn'); +checkPublicSuffix('xn--85x722f.xn--55qx5d.cn', 'xn--85x722f.xn--55qx5d.cn'); +checkPublicSuffix('www.xn--85x722f.xn--55qx5d.cn', 'xn--85x722f.xn--55qx5d.cn'); +checkPublicSuffix('shishi.xn--55qx5d.cn', 'shishi.xn--55qx5d.cn'); +checkPublicSuffix('xn--55qx5d.cn', null); +checkPublicSuffix('xn--85x722f.xn--fiqs8s', 'xn--85x722f.xn--fiqs8s'); +checkPublicSuffix('www.xn--85x722f.xn--fiqs8s', 'xn--85x722f.xn--fiqs8s'); +checkPublicSuffix('shishi.xn--fiqs8s', 'shishi.xn--fiqs8s'); +checkPublicSuffix('xn--fiqs8s', null); diff --git a/netwerk/test/unit/test_psl.js b/netwerk/test/unit/test_psl.js index 446fe4c..251ffa6 100644 --- a/netwerk/test/unit/test_psl.js +++ b/netwerk/test/unit/test_psl.js @@ -1,9 +1,11 @@ -const Cc = Components.classes; -const Ci = Components.interfaces; - var etld = Cc["@mozilla.org/network/effective-tld-service;1"] .getService(Ci.nsIEffectiveTLDService); +var idna = Cc["@mozilla.org/network/idn-service;1"] + .getService(Ci.nsIIDNService); + +var Cr = Components.results; + function run_test() { var file = do_get_file("data/test_psl.txt"); @@ -13,7 +15,7 @@ function run_test() var scriptLoader = Cc["@mozilla.org/moz/jssubscript-loader;1"] .getService(Ci.mozIJSSubScriptLoader); var srvScope = {}; - scriptLoader.loadSubScript(uri.spec, srvScope); + scriptLoader.loadSubScript(uri.spec, srvScope, "utf-8"); } function checkPublicSuffix(host, expectedSuffix) @@ -21,8 +23,14 @@ function checkPublicSuffix(host, expectedSuffix) var actualSuffix = null; try { actualSuffix = etld.getBaseDomainFromHost(host); - } catch (e if e.name == "NS_ERROR_INSUFFICIENT_DOMAIN_LEVELS" || - e.name == "NS_ERROR_ILLEGAL_VALUE") { + } catch (e if e.result == Cr.NS_ERROR_INSUFFICIENT_DOMAIN_LEVELS || + e.result == Cr.NS_ERROR_ILLEGAL_VALUE) { + } + // The EffectiveTLDService always gives back punycoded labels. + // The test suite wants to get back what it put in. + if (actualSuffix !== null && expectedSuffix !== null && + /(^|\.)xn--/.test(actualSuffix) && !/(^|\.)xn--/.test(expectedSuffix)) { + actualSuffix = idna.convertACEtoUTF8(actualSuffix); } do_check_eq(actualSuffix, expectedSuffix); }

1 0

[tor-browser/esr24] Bug 1012694 - IonMonkey (ARM): Use the second scratch register to avoid clobbering the scratch register. r=dougc, a=abillings
by mikeperry＠torproject.org 29 Aug '14

29 Aug '14

commit 8acbe105e17e37d23712925261926f04363f7b22 Author: Douglas Crosher <dtc-moz(a)scieneer.com> Date: Tue Jun 17 11:47:45 2014 +1000 Bug 1012694 - IonMonkey (ARM): Use the second scratch register to avoid clobbering the scratch register. r=dougc, a=abillings --- js/src/jit/arm/MacroAssembler-arm.h | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/js/src/jit/arm/MacroAssembler-arm.h b/js/src/jit/arm/MacroAssembler-arm.h index 04d68af..7bc0da0 100644 --- a/js/src/jit/arm/MacroAssembler-arm.h +++ b/js/src/jit/arm/MacroAssembler-arm.h @@ -763,8 +763,9 @@ class MacroAssemblerARMCompat : public MacroAssemblerARM if (lhs.getTag() == Operand::OP2) { branch32(cond, lhs.toReg(), rhs, label); } else { - ma_ldr(lhs, ScratchRegister); - branch32(cond, ScratchRegister, rhs, label); + // branch32 will use ScratchRegister. + ma_ldr(lhs, secondScratchReg_); + branch32(cond, secondScratchReg_, rhs, label); } } void branch32(Condition cond, const Address &lhs, Register rhs, Label *label) { @@ -772,8 +773,9 @@ class MacroAssemblerARMCompat : public MacroAssemblerARM branch32(cond, ScratchRegister, rhs, label); } void branch32(Condition cond, const Address &lhs, Imm32 rhs, Label *label) { - load32(lhs, ScratchRegister); - branch32(cond, ScratchRegister, rhs, label); + // branch32 will use ScratchRegister. + load32(lhs, secondScratchReg_); + branch32(cond, secondScratchReg_, rhs, label); } void branchPtr(Condition cond, const Address &lhs, Register rhs, Label *label) { branch32(cond, lhs, rhs, label); @@ -856,8 +858,9 @@ class MacroAssemblerARMCompat : public MacroAssemblerARM ma_b(label, cond); } void branchTest32(Condition cond, const Address &address, Imm32 imm, Label *label) { - ma_ldr(Operand(address.base, address.offset), ScratchRegister); - branchTest32(cond, ScratchRegister, imm, label); + // branchTest32 will use ScratchRegister. + load32(address, secondScratchReg_); + branchTest32(cond, secondScratchReg_, imm, label); } void branchTestPtr(Condition cond, const Register &lhs, const Register &rhs, Label *label) { branchTest32(cond, lhs, rhs, label);

1 0