- tbb-commits - lists.torproject.org

[tor-browser/esr24] Backed out changeset 42531d5e6ca2 (Bug 986843) for test failures
by mikeperry＠torproject.org 29 Aug '14

29 Aug '14

commit a79c2bfce5b8d2416d01250dbbaa7e6cf0dc1ae1 Author: Jon Coppeard <jcoppeard(a)mozilla.com> Date: Wed Apr 2 17:19:28 2014 +0100 Backed out changeset 42531d5e6ca2 (Bug 986843) for test failures --- js/src/gc/RootMarking.cpp | 2 +- js/src/gc/Zone.cpp | 1 + js/src/gc/Zone.h | 2 ++ js/src/jsapi.cpp | 29 +++++++++++------------------ js/src/jscompartment.cpp | 2 +- js/src/jscompartment.h | 2 +- js/src/jsgc.cpp | 4 ++-- 7 files changed, 19 insertions(+), 23 deletions(-) diff --git a/js/src/gc/RootMarking.cpp b/js/src/gc/RootMarking.cpp index 88574f3..861c2d6 100644 --- a/js/src/gc/RootMarking.cpp +++ b/js/src/gc/RootMarking.cpp @@ -744,7 +744,7 @@ js::gc::MarkRuntime(JSTracer *trc, bool useSavedRoots) #endif for (CompartmentsIter c(rt); !c.done(); c.next()) - c->markRoots(trc); + c->mark(trc); /* The embedding can register additional roots here. */ for (size_t i = 0; i < rt->gcBlackRootTracers.length(); i++) { diff --git a/js/src/gc/Zone.cpp b/js/src/gc/Zone.cpp index 0b6161c..5625b99 100644 --- a/js/src/gc/Zone.cpp +++ b/js/src/gc/Zone.cpp @@ -23,6 +23,7 @@ using namespace js::gc; JS::Zone::Zone(JSRuntime *rt) : rt(rt), allocator(this), + hold(false), ionUsingBarriers_(false), active(false), gcScheduled(false), diff --git a/js/src/gc/Zone.h b/js/src/gc/Zone.h index 39e867d..73e7043 100644 --- a/js/src/gc/Zone.h +++ b/js/src/gc/Zone.h @@ -108,6 +108,8 @@ struct Zone : private JS::shadow::Zone, js::CompartmentVector compartments; + bool hold; + private: bool ionUsingBarriers_; diff --git a/js/src/jsapi.cpp b/js/src/jsapi.cpp index 68b6afa..3632a74 100644 --- a/js/src/jsapi.cpp +++ b/js/src/jsapi.cpp @@ -3171,32 +3171,23 @@ JS_GetObjectId(JSContext *cx, JSObject *obj, jsid *idp) return JS_TRUE; } -class AutoCompartmentRooter : private JS::CustomAutoRooter +class AutoHoldZone { public: - explicit AutoCompartmentRooter(JSContext *cx, JSCompartment *comp - MOZ_GUARD_OBJECT_NOTIFIER_PARAM) - : CustomAutoRooter(cx), compartment(comp) + explicit AutoHoldZone(Zone *zone + MOZ_GUARD_OBJECT_NOTIFIER_PARAM) + : holdp(&zone->hold) { MOZ_GUARD_OBJECT_NOTIFIER_INIT; + *holdp = true; } - operator JSCompartment *() { - return compartment; - } - - JSCompartment *operator->() { - return compartment; - } - - protected: - virtual void trace(JSTracer *trc) - { - compartment->mark(); + ~AutoHoldZone() { + *holdp = false; } private: - JSCompartment *compartment; + bool *holdp; MOZ_DECL_USE_GUARD_OBJECT_NOTIFIER }; @@ -3218,7 +3209,7 @@ JS_NewGlobalObject(JSContext *cx, JSClass *clasp, JSPrincipals *principals, else zone = ((JSObject *)options.zoneSpec)->zone(); - AutoCompartmentRooter compartment(cx, NewCompartment(cx, zone, principals, options)); + JSCompartment *compartment = NewCompartment(cx, zone, principals, options); if (!compartment) return NULL; @@ -3227,6 +3218,8 @@ JS_NewGlobalObject(JSContext *cx, JSClass *clasp, JSPrincipals *principals, rt->systemZone->isSystem = true; } + AutoHoldZone hold(compartment->zone()); + Rooted<GlobalObject *> global(cx); { AutoCompartment ac(cx, compartment); diff --git a/js/src/jscompartment.cpp b/js/src/jscompartment.cpp index 2e66253..c448e10 100644 --- a/js/src/jscompartment.cpp +++ b/js/src/jscompartment.cpp @@ -488,7 +488,7 @@ JSCompartment::markAllCrossCompartmentWrappers(JSTracer *trc) } void -JSCompartment::markRoots(JSTracer *trc) +JSCompartment::mark(JSTracer *trc) { #ifdef JS_ION if (ionCompartment_) diff --git a/js/src/jscompartment.h b/js/src/jscompartment.h index 1ef2ed8..6cc1bc8 100644 --- a/js/src/jscompartment.h +++ b/js/src/jscompartment.h @@ -293,7 +293,7 @@ struct JSCompartment WrapperEnum(JSCompartment *c) : js::WrapperMap::Enum(c->crossCompartmentWrappers) {} }; - void markRoots(JSTracer *trc); + void mark(JSTracer *trc); bool isDiscardingJitCode(JSTracer *trc); void sweep(js::FreeOp *fop, bool releaseTypes); void sweepCrossCompartmentWrappers(); diff --git a/js/src/jsgc.cpp b/js/src/jsgc.cpp index 3157861..53a636e 100644 --- a/js/src/jsgc.cpp +++ b/js/src/jsgc.cpp @@ -2541,7 +2541,7 @@ SweepZones(FreeOp *fop, bool lastGC) while (read < end) { Zone *zone = *read++; - if (zone->wasGCStarted()) { + if (!zone->hold && zone->wasGCStarted()) { if (zone->allocator.arenas.arenaListsAreEmpty() || lastGC) { zone->allocator.arenas.checkEmptyFreeLists(); if (callback) @@ -2723,7 +2723,7 @@ BeginMarkPhase(JSRuntime *rt) } zone->scheduledForDestruction = false; - zone->maybeAlive = false; + zone->maybeAlive = zone->hold; zone->setPreservingCode(false); }

1 0

[tor-browser/esr24] Bug 971285 - Fix intermittent failure in smil/anim-path-d-01.svg. r=dholbert, a=test-only
by mikeperry＠torproject.org 29 Aug '14

29 Aug '14

commit 7914f72bb54471c69ee62495732900af8c466c3a Author: Robert Longson <longsonr(a)gmail.com> Date: Sat Feb 15 14:08:54 2014 +0000 Bug 971285 - Fix intermittent failure in smil/anim-path-d-01.svg. r=dholbert, a=test-only --- layout/reftests/svg/smil/anim-path-d-01-ref.svg | 3 ++- layout/reftests/svg/smil/anim-path-d-01.svg | 3 ++- layout/reftests/svg/smil/reftest.list | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/layout/reftests/svg/smil/anim-path-d-01-ref.svg b/layout/reftests/svg/smil/anim-path-d-01-ref.svg index 3095da6..b32fd77 100644 --- a/layout/reftests/svg/smil/anim-path-d-01-ref.svg +++ b/layout/reftests/svg/smil/anim-path-d-01-ref.svg @@ -1,6 +1,7 @@ <svg xmlns="http://www.w3.org/2000/svg"> <style type="text/css"> - path { fill: none; stroke: blue; stroke-width: 1px; } + path { fill: none; stroke: blue; stroke-width: 1px; + shape-rendering: crispEdges; } </style> <path d="M10,10 diff --git a/layout/reftests/svg/smil/anim-path-d-01.svg b/layout/reftests/svg/smil/anim-path-d-01.svg index 53e6b69..180cfe5 100644 --- a/layout/reftests/svg/smil/anim-path-d-01.svg +++ b/layout/reftests/svg/smil/anim-path-d-01.svg @@ -8,7 +8,8 @@ <title>Test animation of the 'd' attribute on the 'path' element</title> <script xlink:href="smil-util.js" type="text/javascript"/> <style type="text/css"> - path { fill: none; stroke: blue; stroke-width: 1px; } + path { fill: none; stroke: blue; stroke-width: 1px; + shape-rendering: crispEdges; } </style> diff --git a/layout/reftests/svg/smil/reftest.list b/layout/reftests/svg/smil/reftest.list index 38d1fa2..7f78133 100644 --- a/layout/reftests/svg/smil/reftest.list +++ b/layout/reftests/svg/smil/reftest.list @@ -127,7 +127,7 @@ skip-if(B2G) == anim-polygon-points-01.svg anim-polygon-points-01-ref.svg == anim-polyline-points-01.svg anim-polyline-points-01-ref.svg # animate path data: -skip-if(B2G) fuzzy-if(/^Windows\x20NT\x205\.1/.test(http.oscpu),2,1) fuzzy-if(cocoaWidget&&layersGPUAccelerated,1,13) == anim-path-d-01.svg anim-path-d-01-ref.svg # Bug 726400 # bug 773482 +== anim-path-d-01.svg anim-path-d-01-ref.svg # animate some enumeration attributes: skip-if(B2G) == anim-feComposite-operator-01.svg lime.svg

1 0

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

29 Aug '14

commit 2cab5ce0b080cc82db25cba8ad74b073e21b166d Author: ffxbld <none@none> Date: Sat Mar 8 03:14:44 2014 -0800 No bug, Automated blocklist update from host bld-linux64-spot-006 - a=blocklist-update --- browser/app/blocklist.xml | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/browser/app/blocklist.xml b/browser/app/blocklist.xml index e785663..e4334c4 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="1393524054000"> +<blocklist xmlns="http://www.mozilla.org/2006/addons-blocklist" lastupdate="1394054454000"> <emItems> <emItem blockID="i454" id="sqlmoz(a)facebook.com"> <versionRange minVersion="0" maxVersion="*" severity="3"> @@ -89,6 +89,12 @@ <prefs> </prefs> </emItem> + <emItem blockID="i20" id="{AB2CE124-6272-4b12-94A9-7303C7397BD1}"> + <versionRange minVersion="0.1" maxVersion="5.2.0.7164" severity="1"> + </versionRange> + <prefs> + </prefs> + </emItem> <emItem blockID="i506" id="/^ext@bettersurfplus/"> <versionRange minVersion="0" maxVersion="*" severity="3"> </versionRange> @@ -176,8 +182,8 @@ <prefs> </prefs> </emItem> - <emItem blockID="i20" id="{AB2CE124-6272-4b12-94A9-7303C7397BD1}"> - <versionRange minVersion="0.1" maxVersion="5.2.0.7164" severity="1"> + <emItem blockID="i566" id="{77BEC163-D389-42c1-91A4-C758846296A5}"> + <versionRange minVersion="0" maxVersion="*" severity="1"> </versionRange> <prefs> </prefs> @@ -1374,7 +1380,7 @@ <prefs> </prefs> </emItem> - <emItem blockID="i224" id="{336D0C35-8A85-403a-B9D2-65C292C39087}"> + <emItem blockID="i564" id="/^(firefox@vebergreat\.net|EFGLQA@78ETGYN-0W7FN789T87\.COM|{52b0f3db-f988-4788-b9dc-861d016f4487})$/"> <versionRange minVersion="0" maxVersion="*" severity="1"> </versionRange> <prefs> @@ -1535,6 +1541,12 @@ <prefs> </prefs> </emItem> + <emItem blockID="i224" id="{336D0C35-8A85-403a-B9D2-65C292C39087}"> + <versionRange minVersion="0" maxVersion="*" severity="1"> + </versionRange> + <prefs> + </prefs> + </emItem> <emItem blockID="i452" id="{77beece6-3997-403a-92fa-0055bfcf88e5}"> <versionRange minVersion="0" maxVersion="*" severity="1"> </versionRange>

1 0

[tor-browser/esr24] Bug 977538 - Disable PGO for CanonicalizeNaN. r=luke, a=abillings
by mikeperry＠torproject.org 29 Aug '14

29 Aug '14

commit f36c23ba4142e9c6531fdb160c418970ea6ecbf2 Author: Jan de Mooij <jdemooij(a)mozilla.com> Date: Thu Feb 27 20:48:59 2014 +0100 Bug 977538 - Disable PGO for CanonicalizeNaN. r=luke, a=abillings --- js/public/Value.h | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/js/public/Value.h b/js/public/Value.h index bf29457..b2bd61f 100644 --- a/js/public/Value.h +++ b/js/public/Value.h @@ -819,6 +819,10 @@ GenericNaN() return mozilla::SpecificNaN(0, 0x8000000000000ULL); } +/* MSVC with PGO miscompiles this function. */ +#if defined(_MSC_VER) +# pragma optimize("g", off) +#endif static inline double CanonicalizeNaN(double d) { @@ -826,6 +830,9 @@ CanonicalizeNaN(double d) return GenericNaN(); return d; } +#if defined(_MSC_VER) +# pragma optimize("", on) +#endif /* * JS::Value is the interface for a single JavaScript Engine value. A few

1 0

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

29 Aug '14

commit bad014bd4d3448607fa06a505f45bd264dab4897 Author: ffxbld <none@none> Date: Sat Mar 8 03:19:11 2014 -0800 No bug, Automated HSTS preload list update from host bld-linux64-spot-002 - a=hsts-update --- security/manager/boot/src/nsSTSPreloadList.errors | 2 +- security/manager/boot/src/nsSTSPreloadList.inc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/security/manager/boot/src/nsSTSPreloadList.errors b/security/manager/boot/src/nsSTSPreloadList.errors index a700899..63597b7 100644 --- a/security/manager/boot/src/nsSTSPreloadList.errors +++ b/security/manager/boot/src/nsSTSPreloadList.errors @@ -21,7 +21,6 @@ chrome.google.com: did not receive HSTS header cloud.google.com: did not receive HSTS header code.google.com: did not receive HSTS header codereview.chromium.org: did not receive HSTS header -conformal.com: could not connect to host crate.io: did not receive HSTS header crowdcurity.com: did not receive HSTS header crypto.is: did not receive HSTS header @@ -33,6 +32,7 @@ dropcam.com: did not receive HSTS header email.lookout.com: could not connect to host emailprivacytester.com: did not receive HSTS header encrypted.google.com: did not receive HSTS header +errors.zenpayroll.com: could not connect to host espra.com: could not connect to host factor.cc: could not connect to host fatzebra.com.au: did not receive HSTS header diff --git a/security/manager/boot/src/nsSTSPreloadList.inc b/security/manager/boot/src/nsSTSPreloadList.inc index 42b58d1..eb6e1af 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(1404558339048000); +const PRTime gPreloadListExpirationTime = INT64_C(1405163237024000); class nsSTSPreload {

1 0

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

29 Aug '14

commit f44769c60855019089740334854010f9c214e8f6 Author: ffxbld <none@none> Date: Sat Mar 1 03:11:57 2014 -0800 No bug, Automated blocklist update from host bld-linux64-spot-439 - a=blocklist-update --- browser/app/blocklist.xml | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/browser/app/blocklist.xml b/browser/app/blocklist.xml index 6854686..e785663 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="1392852504000"> +<blocklist xmlns="http://www.mozilla.org/2006/addons-blocklist" lastupdate="1393524054000"> <emItems> <emItem blockID="i454" id="sqlmoz(a)facebook.com"> <versionRange minVersion="0" maxVersion="*" severity="3"> @@ -766,7 +766,7 @@ <prefs> </prefs> </emItem> - <emItem blockID="i394" id="{7D4F1959-3F72-49d5-8E59-F02F8AA6815D}"> + <emItem blockID="i562" id="iobitapps(a)mybrowserbar.com"> <versionRange minVersion="0" maxVersion="*" severity="1"> </versionRange> <prefs> @@ -922,6 +922,12 @@ <prefs> </prefs> </emItem> + <emItem blockID="i560" id="adsremoval(a)adsremoval.net"> + <versionRange minVersion="0" maxVersion="*" severity="1"> + </versionRange> + <prefs> + </prefs> + </emItem> <emItem blockID="i461" id="{8E9E3331-D360-4f87-8803-52DE43566502}"> <versionRange minVersion="0" maxVersion="*" severity="1"> </versionRange> @@ -1424,6 +1430,12 @@ <prefs> </prefs> </emItem> + <emItem blockID="i394" id="{7D4F1959-3F72-49d5-8E59-F02F8AA6815D}"> + <versionRange minVersion="0" maxVersion="*" severity="1"> + </versionRange> + <prefs> + </prefs> + </emItem> <emItem blockID="i165" id="{EEF73632-A085-4fd3-A778-ECD82C8CB297}"> <versionRange minVersion="0" maxVersion="*" severity="3"> </versionRange> @@ -2033,6 +2045,12 @@ </targetApplication> </versionRange> </pluginItem> + <pluginItem blockID="p556"> + <match name="filename" exp="npUnity3D32\.dll" /> <versionRange minVersion="0" maxVersion="4.3.4.99999999" severity="0" vulnerabilitystatus="1"></versionRange> + </pluginItem> + <pluginItem blockID="p558"> + <match name="description" exp="^($|Unity Web Player version ([0-3]|(4\.([0-2]|3(\.[0-4])?[^0-9.]))))" /> <match name="filename" exp="Unity Web Player\.plugin" /> <versionRange severity="0" vulnerabilitystatus="1"></versionRange> + </pluginItem> </pluginItems> <gfxItems>

1 0

[tor-browser/esr24] Bug 950604 - Backport of a small bugfix that was part of bug 861925. r=luke, a=sledru
by mikeperry＠torproject.org 29 Aug '14

29 Aug '14

commit 2c7a92b1f7a9b83450bd525b3014e13a22ca55b6 Author: Steve Fink <sfink(a)mozilla.com> Date: Wed Jan 22 22:14:04 2014 -0800 Bug 950604 - Backport of a small bugfix that was part of bug 861925. r=luke, a=sledru --- js/src/jstypedarray.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/js/src/jstypedarray.cpp b/js/src/jstypedarray.cpp index 53afdc1..b8cf614 100644 --- a/js/src/jstypedarray.cpp +++ b/js/src/jstypedarray.cpp @@ -651,7 +651,9 @@ ArrayBufferObject::stealContents(JSContext *cx, JSObject *obj, void **contents, } // Neuter the donor ArrayBuffer and all views of it + uint32_t flags = header->flags; ArrayBufferObject::setElementsHeader(header, 0); + header->flags = flags; GetViewList(&buffer)->init(views); for (JSObject *view = views; view; view = NextView(view)) TypedArray::neuter(view);

1 0

[tor-browser/esr24] bug 967341 - uri management r=honzab a=sylvestre
by mikeperry＠torproject.org 29 Aug '14

29 Aug '14

commit 6a5a507221409dcf7c0e530dc00df4f414d21b46 Author: Patrick McManus <mcmanus(a)ducksong.com> Date: Tue Feb 4 11:55:02 2014 -0500 bug 967341 - uri management r=honzab a=sylvestre --- netwerk/base/src/nsStandardURL.cpp | 36 +++++++++++++++++++++--------------- 1 file changed, 21 insertions(+), 15 deletions(-) diff --git a/netwerk/base/src/nsStandardURL.cpp b/netwerk/base/src/nsStandardURL.cpp index 16a001c..2216580 100644 --- a/netwerk/base/src/nsStandardURL.cpp +++ b/netwerk/base/src/nsStandardURL.cpp @@ -351,6 +351,7 @@ nsStandardURL::Clear() mPort = -1; + mScheme.Reset(); mAuthority.Reset(); mUsername.Reset(); mPassword.Reset(); @@ -1132,11 +1133,16 @@ nsStandardURL::SetSpec(const nsACString &input) // parse the given URL... nsresult rv = ParseURL(spec, specLength); - if (NS_FAILED(rv)) return rv; + if (NS_SUCCEEDED(rv)) { + // finally, use the URLSegment member variables to build a normalized + // copy of |spec| + rv = BuildNormalizedSpec(spec); + } - // finally, use the URLSegment member variables to build a normalized - // copy of |spec| - rv = BuildNormalizedSpec(spec); + if (NS_FAILED(rv)) { + Clear(); + return rv; + } #if defined(PR_LOGGING) if (LOG_ENABLED()) { @@ -1169,16 +1175,16 @@ nsStandardURL::SetScheme(const nsACString &input) LOG(("nsStandardURL::SetScheme [scheme=%s]\n", scheme.get())); if (scheme.IsEmpty()) { - NS_ERROR("cannot remove the scheme from an url"); + NS_WARNING("cannot remove the scheme from an url"); return NS_ERROR_UNEXPECTED; } if (mScheme.mLen < 0) { - NS_ERROR("uninitialized"); + NS_WARNING("uninitialized"); return NS_ERROR_NOT_INITIALIZED; } if (!net_IsValidScheme(scheme)) { - NS_ERROR("the given url scheme contains invalid characters"); + NS_WARNING("the given url scheme contains invalid characters"); return NS_ERROR_UNEXPECTED; } @@ -1211,11 +1217,11 @@ nsStandardURL::SetUserPass(const nsACString &input) if (mURLType == URLTYPE_NO_AUTHORITY) { if (userpass.IsEmpty()) return NS_OK; - NS_ERROR("cannot set user:pass on no-auth url"); + NS_WARNING("cannot set user:pass on no-auth url"); return NS_ERROR_UNEXPECTED; } if (mAuthority.mLen < 0) { - NS_ERROR("uninitialized"); + NS_WARNING("uninitialized"); return NS_ERROR_NOT_INITIALIZED; } @@ -1312,7 +1318,7 @@ nsStandardURL::SetUsername(const nsACString &input) if (mURLType == URLTYPE_NO_AUTHORITY) { if (username.IsEmpty()) return NS_OK; - NS_ERROR("cannot set username on no-auth url"); + NS_WARNING("cannot set username on no-auth url"); return NS_ERROR_UNEXPECTED; } @@ -1357,11 +1363,11 @@ nsStandardURL::SetPassword(const nsACString &input) if (mURLType == URLTYPE_NO_AUTHORITY) { if (password.IsEmpty()) return NS_OK; - NS_ERROR("cannot set password on no-auth url"); + NS_WARNING("cannot set password on no-auth url"); return NS_ERROR_UNEXPECTED; } if (mUsername.mLen <= 0) { - NS_ERROR("cannot set password without existing username"); + NS_WARNING("cannot set password without existing username"); return NS_ERROR_FAILURE; } @@ -1783,7 +1789,7 @@ nsStandardURL::Resolve(const nsACString &in, nsACString &out) // initialize a nsStandardURL object. if (mScheme.mLen < 0) { - NS_ERROR("unable to Resolve URL: this URL not initialized"); + NS_WARNING("unable to Resolve URL: this URL not initialized"); return NS_ERROR_NOT_INITIALIZED; } @@ -2483,12 +2489,12 @@ nsStandardURL::EnsureFile() // Parse the spec if we don't have a cached result if (mSpec.IsEmpty()) { - NS_ERROR("url not initialized"); + NS_WARNING("url not initialized"); return NS_ERROR_NOT_INITIALIZED; } if (!SegmentIs(mScheme, "file")) { - NS_ERROR("not a file URL"); + NS_WARNING("not a file URL"); return NS_ERROR_FAILURE; }

1 0

[tor-browser/esr24] Bug 963974 - Null mCurrentCompositeTask after calling Cancel() on it. r=mattwoodrow, a=1.2.x+
by mikeperry＠torproject.org 29 Aug '14

29 Aug '14

commit 91ef4ab9fd3794de7e18c9c9470511a26776da3b Author: Benoit Jacob <bjacob(a)mozilla.com> Date: Thu Feb 20 11:41:39 2014 -0500 Bug 963974 - Null mCurrentCompositeTask after calling Cancel() on it. r=mattwoodrow, a=1.2.x+ --- gfx/layers/ipc/CompositorParent.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/gfx/layers/ipc/CompositorParent.cpp b/gfx/layers/ipc/CompositorParent.cpp index be6dbf7..4b61ec4 100644 --- a/gfx/layers/ipc/CompositorParent.cpp +++ b/gfx/layers/ipc/CompositorParent.cpp @@ -256,6 +256,7 @@ CompositorParent::RecvFlushRendering() // and do it immediately instead. if (mCurrentCompositeTask) { mCurrentCompositeTask->Cancel(); + mCurrentCompositeTask = nullptr; ComposeToTarget(nullptr); } return true;

1 0

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

29 Aug '14

commit 8ebd92cdd60c09b0226a5887150fe449db7aa668 Author: ffxbld <none@none> Date: Sat Feb 22 03:14:29 2014 -0800 No bug, Automated HSTS preload list update from host bld-centos6-hp-009 - a=hsts-update --- security/manager/boot/src/nsSTSPreloadList.errors | 2 -- security/manager/boot/src/nsSTSPreloadList.inc | 6 +++++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/security/manager/boot/src/nsSTSPreloadList.errors b/security/manager/boot/src/nsSTSPreloadList.errors index 2bd6d28..f745fc5 100644 --- a/security/manager/boot/src/nsSTSPreloadList.errors +++ b/security/manager/boot/src/nsSTSPreloadList.errors @@ -37,7 +37,6 @@ factor.cc: could not connect to host fatzebra.com.au: did not receive HSTS header fj.simple.com: did not receive HSTS header get.zenpayroll.com: did not receive HSTS header -getcloak.com: max-age too low: 2678400 glass.google.com: did not receive HSTS header gmail.com: did not receive HSTS header googlemail.com: did not receive HSTS header @@ -107,7 +106,6 @@ www.cueup.com: did not receive HSTS header www.developer.mydigipass.com: could not connect to host www.dropcam.com: max-age too low: 2592000 www.elanex.biz: did not receive HSTS header -www.getcloak.com: max-age too low: 2678400 www.gmail.com: did not receive HSTS header www.googlemail.com: did not receive HSTS header www.greplin.com: could not connect to host diff --git a/security/manager/boot/src/nsSTSPreloadList.inc b/security/manager/boot/src/nsSTSPreloadList.inc index e65dda8..47b2c63 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(1403348772104000); +const PRTime gPreloadListExpirationTime = INT64_C(1403953602724000); class nsSTSPreload { @@ -19,6 +19,7 @@ class nsSTSPreload static const nsSTSPreload kSTSPreloadList[] = { { "accounts.google.com", true }, + { "aclu.org", false }, { "aladdinschools.appspot.com", false }, { "alpha.irccloud.com", false }, { "api.intercom.io", false }, @@ -72,6 +73,7 @@ static const nsSTSPreload kSTSPreloadList[] = { { "forum.linode.com", false }, { "forum.quantifiedself.com", true }, { "gernert-server.de", true }, + { "getcloak.com", false }, { "getlantern.org", false }, { "go.xero.com", false }, { "gocardless.com", true }, @@ -157,12 +159,14 @@ static const nsSTSPreload kSTSPreloadList[] = { { "wiki.python.org", true }, { "wiz.biz", true }, { "writeapp.me", false }, + { "www.aclu.org", false }, { "www.apollo-auto.com", true }, { "www.braintreepayments.com", false }, { "www.calyxinstitute.org", false }, { "www.cyveillance.com", true }, { "www.entropia.de", false }, { "www.evernote.com", false }, + { "www.getcloak.com", false }, { "www.gov.uk", false }, { "www.grc.com", false }, { "www.heliosnet.com", true },

1 0