- tbb-commits - lists.torproject.org

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

29 Aug '14

commit e21dc00b35394cf43ff83c2634c9edafd4659966 Author: ffxbld <none@none> Date: Sat Jul 19 03:13:17 2014 -0700 No bug, Automated HSTS preload list update from host bld-linux64-spot-028 - a=hsts-update --- security/manager/boot/src/nsSTSPreloadList.errors | 7 ++----- security/manager/boot/src/nsSTSPreloadList.inc | 7 ++++++- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/security/manager/boot/src/nsSTSPreloadList.errors b/security/manager/boot/src/nsSTSPreloadList.errors index 90da6bf..f83a8d9 100644 --- a/security/manager/boot/src/nsSTSPreloadList.errors +++ b/security/manager/boot/src/nsSTSPreloadList.errors @@ -63,7 +63,7 @@ intercom.io: did not receive HSTS header iop.intuit.com: max-age too low: 86400 irccloud.com: did not receive HSTS header jitsi.org: did not receive HSTS header -jottit.com: did not receive HSTS header +jottit.com: could not connect to host keymaster.lookout.com: did not receive HSTS header kiwiirc.com: max-age too low: 5256000 ledgerscope.net: did not receive HSTS header @@ -92,7 +92,7 @@ platform.lookout.com: could not connect to host play.google.com: did not receive HSTS header prodpad.com: did not receive HSTS header profiles.google.com: did not receive HSTS header -rapidresearch.me: did not receive HSTS header +rapidresearch.me: could not connect to host riseup.net: did not receive HSTS header sah3.net: could not connect to host saturngames.co.uk: did not receive HSTS header @@ -101,10 +101,8 @@ 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 @@ -131,7 +129,6 @@ www.elanex.biz: did not receive HSTS header www.gmail.com: did not receive HSTS header www.googlemail.com: did not receive HSTS header www.greplin.com: could not connect to host -www.intercom.io: did not receive HSTS header www.jitsi.org: did not receive HSTS header www.lastpass.com: did not receive HSTS header www.ledgerscope.net: did not receive HSTS header diff --git a/security/manager/boot/src/nsSTSPreloadList.inc b/security/manager/boot/src/nsSTSPreloadList.inc index dd480ac..96dbe38 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(1416045947439000); +const PRTime gPreloadListExpirationTime = INT64_C(1416650838534000); class nsSTSPreload { @@ -84,6 +84,7 @@ static const nsSTSPreload kSTSPreloadList[] = { { "feedbin.com", false }, { "fiken.no", true }, { "fj.simple.com", false }, + { "flynn.io", true }, { "forum.linode.com", false }, { "forum.quantifiedself.com", true }, { "gernert-server.de", true }, @@ -101,6 +102,7 @@ static const nsSTSPreload kSTSPreloadList[] = { { "imouto.my", false }, { "inertianetworks.com", true }, { "itriskltd.com", true }, + { "jackyyf.com", false }, { "keeperapp.com", true }, { "keepersecurity.com", true }, { "keyerror.com", true }, @@ -178,7 +180,9 @@ static const nsSTSPreload kSTSPreloadList[] = { { "securityheaders.com", true }, { "seifried.org", true }, { "shodan.io", true }, + { "silentcircle.com", true }, { "simbolo.co.uk", false }, + { "simple.com", false }, { "skydrive.live.com", false }, { "squareup.com", false }, { "stage.wepay.com", false }, @@ -235,6 +239,7 @@ static const nsSTSPreload kSTSPreloadList[] = { { "www.gov.uk", false }, { "www.grc.com", false }, { "www.heliosnet.com", true }, + { "www.intercom.io", false }, { "www.irccloud.com", false }, { "www.linode.com", false }, { "www.lookout.com", false },

1 0

[tor-browser/esr24] Bug 1035551 - Remove the new logging information that doesn't apply to non-trunk branches. a=NPOTB
by mikeperry＠torproject.org 29 Aug '14

29 Aug '14

commit f76cfea47677dbed4d3dfa93e1f1e3c22d8640de Author: Ryan VanderMeulen <ryanvm(a)gmail.com> Date: Thu Jul 17 13:32:11 2014 -0400 Bug 1035551 - Remove the new logging information that doesn't apply to non-trunk branches. a=NPOTB --- testing/config/mozharness/marionette.py | 5 ----- 1 file changed, 5 deletions(-) diff --git a/testing/config/mozharness/marionette.py b/testing/config/mozharness/marionette.py index 6794bbc..f0cee5b 100644 --- a/testing/config/mozharness/marionette.py +++ b/testing/config/mozharness/marionette.py @@ -5,20 +5,17 @@ config = { "marionette_desktop_options": [ "--type=%(type)s", - "--log-raw=%(raw_log_file)s", "--binary=%(binary)s", "--address=%(address)s", ], "marionette_emulator_options": [ "--type=%(type)s", - "--log-raw=%(raw_log_file)s", "--logcat-dir=%(logcat_dir)s", "--emulator=%(emulator)s", "--homedir=%(homedir)s", ], "webapi_emulator_options": [ "--type=%(type)s", - "--log-raw=%(raw_log_file)s", "--symbols-path=%(symbols_path)s", "--logcat-dir=%(logcat_dir)s", "--emulator=%(emulator)s", @@ -36,7 +33,6 @@ config = { "--symbols-path=%(symbols_path)s", "--xml-output=%(xml_output)s", "--html-output=%(html_output)s", - "--log-raw=%(raw_log_file)s", "--logcat-dir=%(logcat_dir)s", "--emulator=%(emulator)s", "--homedir=%(homedir)s", @@ -50,7 +46,6 @@ config = { "--symbols-path=%(symbols_path)s", "--xml-output=%(xml_output)s", "--html-output=%(html_output)s", - "--log-raw=%(raw_log_file)s", "--binary=%(binary)s", "--address=%(address)s", ],

1 0

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

29 Aug '14

commit 89942ba11cfb2d441346036501aaeaa2102036c8 Author: tbirdbld <none@none> Date: Thu Jul 17 09:53:59 2014 -0400 Automated checkin: version bump for thunderbird 24.7.0 release. DONTBUILD CLOSED TREE a=release --- config/milestone.txt | 2 +- js/src/config/milestone.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/config/milestone.txt b/config/milestone.txt index c293ee8..20c6f99 100644 --- a/config/milestone.txt +++ b/config/milestone.txt @@ -10,4 +10,4 @@ # hardcoded milestones in the tree from these two files. #-------------------------------------------------------- -24.7.0esrpre +24.7.0 diff --git a/js/src/config/milestone.txt b/js/src/config/milestone.txt index c293ee8..20c6f99 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.7.0esrpre +24.7.0

1 0

[tor-browser/esr24] Backed out changeset 810977d38c0d (bug 701479) for jetpack orange, DONTBUILD because strict backout and RyanVM says so.
by mikeperry＠torproject.org 29 Aug '14

29 Aug '14

commit c523f5c0036542fc1ed36b78e46b99f1f86c8728 Author: Gijs Kruitbosch <gijskruitbosch(a)gmail.com> Date: Tue Jul 15 14:46:52 2014 +0100 Backed out changeset 810977d38c0d (bug 701479) for jetpack orange, DONTBUILD because strict backout and RyanVM says so. --- widget/windows/nsDeviceContextSpecWin.cpp | 196 +++++++++++++++++++++++++++++ 1 file changed, 196 insertions(+) diff --git a/widget/windows/nsDeviceContextSpecWin.cpp b/widget/windows/nsDeviceContextSpecWin.cpp index 1da105f..134d74f 100644 --- a/widget/windows/nsDeviceContextSpecWin.cpp +++ b/widget/windows/nsDeviceContextSpecWin.cpp @@ -181,6 +181,189 @@ 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, @@ -215,6 +398,15 @@ 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); @@ -245,6 +437,10 @@ 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] 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] 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

[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 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 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