From 3a0af70d3f623454a6de2a8b5c98a4aa312f2665 Mon Sep 17 00:00:00 2001 From: Timothy Nikkel Date: Wed, 20 Dec 2017 01:02:57 -0600 Subject: [PATCH 01/32] Bug 1404366. Convert the image data for BMPs inside ICOs that has a mask to premultiplied alpha as expected. r=aosmond If we aren't using a downscaler we avoid this bug because the mask is either 100% transparent or 100% opaque, and in the transparent case we just set the whole pixel (32 bits) to 0. But when we are using a downscaler we just replace the alpha values in the original surface (leaving the color values untouched). We need to go the full premultiply route because after downscaling the mask we can have any value for alpha instead of just 0 or 255. --- image/decoders/nsICODecoder.cpp | 9 +++++++++ image/test/reftest/downscaling/1404366-1.html | 14 ++++++++++++++ image/test/reftest/downscaling/1404366-1.ico | Bin 0 -> 4287 bytes image/test/reftest/downscaling/reftest.list | 3 ++- 4 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 image/test/reftest/downscaling/1404366-1.html create mode 100644 image/test/reftest/downscaling/1404366-1.ico diff --git a/image/decoders/nsICODecoder.cpp b/image/decoders/nsICODecoder.cpp index 3d6fd6dc7494..a230be3f1794 100644 --- a/image/decoders/nsICODecoder.cpp +++ b/image/decoders/nsICODecoder.cpp @@ -13,6 +13,8 @@ #include "mozilla/EndianUtils.h" #include "mozilla/Move.h" +#include "mozilla/gfx/Swizzle.h" + #include "RasterImage.h" using namespace mozilla::gfx; @@ -618,6 +620,13 @@ nsICODecoder::FinishMask() for (size_t i = 3 ; i < bmpDecoder->GetImageDataLength() ; i += 4) { imageData[i] = mMaskBuffer[i]; } + int32_t stride = mDownscaler->TargetSize().width * sizeof(uint32_t); + DebugOnly ret = + // We know the format is B8G8R8A8 because we always assume bmp's inside + // ico's are transparent. + PremultiplyData(imageData, stride, SurfaceFormat::B8G8R8A8, + imageData, stride, SurfaceFormat::B8G8R8A8, mDownscaler->TargetSize()); + MOZ_ASSERT(ret); } return Transition::To(ICOState::FINISHED_RESOURCE, 0); diff --git a/image/test/reftest/downscaling/1404366-1.html b/image/test/reftest/downscaling/1404366-1.html new file mode 100644 index 000000000000..165cc7f9343f --- /dev/null +++ b/image/test/reftest/downscaling/1404366-1.html @@ -0,0 +1,14 @@ + + + + + + + \ No newline at end of file diff --git a/image/test/reftest/downscaling/1404366-1.ico b/image/test/reftest/downscaling/1404366-1.ico new file mode 100644 index 0000000000000000000000000000000000000000..51c020b069a541988d83d4f0d99d10222cc87ecf GIT binary patch literal 4287 zcmeIwu?>JQ3`Eh-2C1lBGDgOYSkhbuphiO9*15RSdT?Z`*q1fn1g<0%Gui#ybT`Hy bXg~uR(0~RspaBhNKm!`kfCm0;;Qo3Zk+n=Y literal 0 HcmV?d00001 diff --git a/image/test/reftest/downscaling/reftest.list b/image/test/reftest/downscaling/reftest.list index a3a198ab6f8f..79462b99acc3 100644 --- a/image/test/reftest/downscaling/reftest.list +++ b/image/test/reftest/downscaling/reftest.list @@ -210,5 +210,6 @@ fuzzy(18,128) == downscale-32px.html?-png-in.ico downscale-32px-ref.html == huge-1.html?32768x100.jpg,100,100 huge-1.html?100x100.jpg,100,100 == huge-1.html?32768x100.jpg,32768,100 huge-1.html?100x100.jpg,32768,100 -# Only need to run this with downscaling on +# Only need to run these with downscaling on != 1421191-1.html about:blank +== 1404366-1.html about:blank From 4b47b52afe84abb6eacbcce6169aac704f269e5d Mon Sep 17 00:00:00 2001 From: Stone Shih Date: Fri, 3 Nov 2017 18:25:49 +0800 Subject: [PATCH 02/32] Bug 1414204 Part1: Suppress input events when there is a dnd session. r=smaug. There may be some pending input events in the queue of thread when content starts a dnd operation. Spec says that input events should be suppressed when there is a dnd operation. Add a flag in ESM and turn on/off when start/finish a dnd operation. Checking the flag in PresShell::HandleEvent because we may start a dnd operation with pointermove and we want to suppress the mousemove as well. MozReview-Commit-ID: 43NZrA7SW4c --- dom/events/EventStateManager.cpp | 2 ++ dom/events/EventStateManager.h | 18 ++++++++++++++++++ layout/base/PresShell.cpp | 10 ++++++++++ widget/nsDragServiceProxy.cpp | 19 +++++++++++++++++++ widget/nsDragServiceProxy.h | 5 +++++ 5 files changed, 54 insertions(+) diff --git a/dom/events/EventStateManager.cpp b/dom/events/EventStateManager.cpp index 8d92d8929dd0..6b70c7d5c470 100644 --- a/dom/events/EventStateManager.cpp +++ b/dom/events/EventStateManager.cpp @@ -290,6 +290,8 @@ bool EventStateManager::WheelPrefs::sWheelEventsEnabledOnPlugins = true; EventStateManager::DeltaAccumulator* EventStateManager::DeltaAccumulator::sInstance = nullptr; +bool EventStateManager::sIsInputEventsSuppressed = false; + EventStateManager::EventStateManager() : mLockCursor(0) , mLastFrameConsumedSetCursor(false) diff --git a/dom/events/EventStateManager.h b/dom/events/EventStateManager.h index 4e555c2930e8..e93e8ea08f1c 100644 --- a/dom/events/EventStateManager.h +++ b/dom/events/EventStateManager.h @@ -315,6 +315,22 @@ public: // wheel (as opposed to, say, a selection or touch scroll). static bool CanVerticallyScrollFrameWithWheel(nsIFrame* aFrame); + static void SuppressInputEvents() + { + MOZ_ASSERT(!sIsInputEventsSuppressed); + sIsInputEventsSuppressed = true; + } + + static void UnsuppressInputEvents() + { + sIsInputEventsSuppressed = false; + } + + static bool IsInputEventsSuppressed() + { + return sIsInputEventsSuppressed; + } + // Holds the point in screen coords that a mouse event was dispatched to, // before we went into pointer lock mode. This is constantly updated while // the pointer is not locked, but we don't update it while the pointer is @@ -1088,6 +1104,8 @@ private: // at the end of the input. static TimeStamp sLatestUserInputStart; + static bool sIsInputEventsSuppressed; + RefPtr mMouseEnterLeaveHelper; nsRefPtrHashtable mPointersEnterLeaveHelper; diff --git a/layout/base/PresShell.cpp b/layout/base/PresShell.cpp index 9a83dadbf7a4..2ae6e597510f 100644 --- a/layout/base/PresShell.cpp +++ b/layout/base/PresShell.cpp @@ -6931,6 +6931,16 @@ PresShell::HandleEvent(nsIFrame* aFrame, return NS_OK; } + if (EventStateManager::IsInputEventsSuppressed() && + (aEvent->mClass == eMouseEventClass || + aEvent->mClass == eWheelEventClass || + aEvent->mClass == ePointerEventClass || + aEvent->mClass == eTouchEventClass || + aEvent->mClass == eKeyboardEventClass || + aEvent->mClass == eCompositionEventClass)) { + return NS_OK; + } + RecordMouseLocation(aEvent); if (AccessibleCaretEnabled(mDocument->GetDocShell())) { diff --git a/widget/nsDragServiceProxy.cpp b/widget/nsDragServiceProxy.cpp index 98be74d3042a..e4a98d4d9ea2 100644 --- a/widget/nsDragServiceProxy.cpp +++ b/widget/nsDragServiceProxy.cpp @@ -9,6 +9,7 @@ #include "nsISupportsPrimitives.h" #include "mozilla/dom/TabChild.h" #include "mozilla/gfx/2D.h" +#include "mozilla/EventStateManager.h" #include "mozilla/UniquePtr.h" #include "mozilla/Unused.h" #include "nsContentUtils.h" @@ -88,3 +89,21 @@ nsDragServiceProxy::InvokeDragSessionImpl(nsIArray* aArrayTransferables, StartDragSession(); return NS_OK; } + +NS_IMETHODIMP +nsDragServiceProxy::StartDragSession() +{ + // Normally, OS stops firing input events when a drag operation starts. But + // there may be some pending input events queued in the content process. We + // have to suppress them since spec says that input events must be suppressed + // when there is a dnd session. + EventStateManager::SuppressInputEvents(); + return nsBaseDragService::StartDragSession(); +} + +NS_IMETHODIMP +nsDragServiceProxy::EndDragSession(bool aDoneDrag, uint32_t aKeyModifiers) +{ + EventStateManager::UnsuppressInputEvents(); + return nsBaseDragService::EndDragSession(aDoneDrag, aKeyModifiers); +} diff --git a/widget/nsDragServiceProxy.h b/widget/nsDragServiceProxy.h index fcde3d25de75..2a4e61b870f6 100644 --- a/widget/nsDragServiceProxy.h +++ b/widget/nsDragServiceProxy.h @@ -19,6 +19,11 @@ public: virtual nsresult InvokeDragSessionImpl(nsIArray* anArrayTransferables, nsIScriptableRegion* aRegion, uint32_t aActionType) override; + + // nsIDragService + NS_IMETHOD StartDragSession() override; + NS_IMETHOD EndDragSession(bool aDoneDrag, uint32_t aKeyModifiers) override; + private: virtual ~nsDragServiceProxy(); }; From 994434653cebf37ae9cb401de76e8b4907aa649c Mon Sep 17 00:00:00 2001 From: Stone Shih Date: Tue, 7 Nov 2017 19:44:24 +0800 Subject: [PATCH 03/32] Bug 1414204 Part2: Tweak the API to synthesize dnd operations. r=smaug. SynthesizeDrop synthesizes a dnd operation by starting a drag session and firing mouse events. Tweak the API to follow the order of real use cases. MozReview-Commit-ID: 1SdJPUtSVKq --- .../mochitest/tests/SimpleTest/EventUtils.js | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/testing/mochitest/tests/SimpleTest/EventUtils.js b/testing/mochitest/tests/SimpleTest/EventUtils.js index 998aaedc6c9d..e4deb6ccbad2 100644 --- a/testing/mochitest/tests/SimpleTest/EventUtils.js +++ b/testing/mochitest/tests/SimpleTest/EventUtils.js @@ -2170,11 +2170,12 @@ function synthesizeDragOver(aSrcElement, aDestElement, aDragData, aDropEffect, a const obs = _EU_Cc["@mozilla.org/observer-service;1"].getService(_EU_Ci.nsIObserverService); const ds = _EU_Cc["@mozilla.org/widget/dragservice;1"].getService(_EU_Ci.nsIDragService); - var sess = ds.getCurrentSession(); // This method runs before other callbacks, and acts as a way to inject the // initial drag data into the DataTransfer. function fillDrag(event) { + ds.startDragSession(); + if (aDragData) { for (var i = 0; i < aDragData.length; i++) { var item = aDragData[i]; @@ -2189,13 +2190,15 @@ function synthesizeDragOver(aSrcElement, aDestElement, aDragData, aDropEffect, a function trapDrag(subject, topic) { if (topic == "on-datatransfer-available") { + var sess = ds.getCurrentSession(); sess.dataTransfer = _EU_maybeUnwrap(_EU_maybeWrap(subject).mozCloneForEvent("drop")); sess.dataTransfer.dropEffect = subject.dropEffect; + obs.removeObserver(trapDrag, "on-datatransfer-available"); } } // need to use real mouse action - aWindow.addEventListener("dragstart", fillDrag, true); + aWindow.addEventListener("dragstart", fillDrag, { capture: true, once: true }); obs.addObserver(trapDrag, "on-datatransfer-available"); synthesizeMouseAtCenter(aSrcElement, { type: "mousedown" }, aWindow); @@ -2204,10 +2207,8 @@ function synthesizeDragOver(aSrcElement, aDestElement, aDragData, aDropEffect, a var y = rect.height / 2; synthesizeMouse(aSrcElement, x, y, { type: "mousemove" }, aWindow); synthesizeMouse(aSrcElement, x+10, y+10, { type: "mousemove" }, aWindow); - aWindow.removeEventListener("dragstart", fillDrag, true); - obs.removeObserver(trapDrag, "on-datatransfer-available"); - var dataTransfer = sess.dataTransfer; + var dataTransfer = ds.getCurrentSession().dataTransfer; // The EventStateManager will fire our dragenter event if it needs to. var event = createDragEventObject("dragover", aDestElement, aDestWindow, @@ -2283,11 +2284,6 @@ function synthesizeDrop(aSrcElement, aDestElement, aDragData, aDropEffect, aWind aDestWindow = aWindow; } - var ds = _EU_Cc["@mozilla.org/widget/dragservice;1"] - .getService(_EU_Ci.nsIDragService); - - ds.startDragSession(); - try { var [result, dataTransfer] = synthesizeDragOver(aSrcElement, aDestElement, aDragData, aDropEffect, @@ -2296,6 +2292,7 @@ function synthesizeDrop(aSrcElement, aDestElement, aDragData, aDropEffect, aWind return synthesizeDropAfterDragOver(result, dataTransfer, aDestElement, aDestWindow, aDragEvent); } finally { + var ds = _EU_Cc["@mozilla.org/widget/dragservice;1"].getService(_EU_Ci.nsIDragService); ds.endDragSession(true, _parseModifiers(aDragEvent)); } } From 1a9d2b96391a28bfcb01eb08b4b7e28ab3d5f702 Mon Sep 17 00:00:00 2001 From: Stone Shih Date: Fri, 10 Nov 2017 11:52:14 +0800 Subject: [PATCH 04/32] Bug 1414204 Part3: Revise test_bug470212.html to drag the correct element. r=smaug. This test case is broken. The anchor element is drag but not canvas element. Shift the position of mousedown event a little bit so that the canvas element is drag. MozReview-Commit-ID: 5Ebqtbzwg0d --- layout/generic/test/test_bug470212.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/layout/generic/test/test_bug470212.html b/layout/generic/test/test_bug470212.html index 1025d89ef590..35833fdad91b 100644 --- a/layout/generic/test/test_bug470212.html +++ b/layout/generic/test/test_bug470212.html @@ -27,7 +27,7 @@ function doShiftDrag(){ // key, follows by two mouse move events. // Press on left-top corner of the canvas element. - wu.sendMouseEvent('mousedown', canvasRect.left, canvasRect.top, 0, 1, 4); + wu.sendMouseEvent('mousedown', canvasRect.left + 1, canvasRect.top + 1, 0, 1, 4); // Move to the center of this cavas element. wu.sendMouseEvent('mousemove', canvasRect.left + (canvasRect.width / 2), canvasRect.top + (canvasRect.height / 2), 0, 0, 4); From ff844cca1d7f0f5e14ef7e3ff90a050db867a79b Mon Sep 17 00:00:00 2001 From: Stone Shih Date: Wed, 6 Dec 2017 16:54:44 +0800 Subject: [PATCH 05/32] Bug 1414204 Part4: Check headless mode before calling GDK_ROOT_WINDOW. f=bdahl. r=jimm. --- dom/plugins/base/nsPluginInstanceOwner.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dom/plugins/base/nsPluginInstanceOwner.cpp b/dom/plugins/base/nsPluginInstanceOwner.cpp index 3aa6ff4bc3d4..978376f42e60 100644 --- a/dom/plugins/base/nsPluginInstanceOwner.cpp +++ b/dom/plugins/base/nsPluginInstanceOwner.cpp @@ -2300,7 +2300,7 @@ nsEventStatus nsPluginInstanceOwner::ProcessEvent(const WidgetGUIEvent& anEvent) rootPoint = anEvent.mRefPoint + widget->WidgetToScreenOffset(); } #ifdef MOZ_WIDGET_GTK - Window root = GDK_ROOT_WINDOW(); + Window root = gfxPlatform::IsHeadless() ? X11None : GDK_ROOT_WINDOW(); #else Window root = X11None; // Could XQueryTree, but this is not important. #endif @@ -2387,7 +2387,7 @@ nsEventStatus nsPluginInstanceOwner::ProcessEvent(const WidgetGUIEvent& anEvent) { XKeyEvent &event = pluginEvent.xkey; #ifdef MOZ_WIDGET_GTK - event.root = GDK_ROOT_WINDOW(); + event.root = gfxPlatform::IsHeadless() ? X11None : GDK_ROOT_WINDOW(); event.time = anEvent.mTime; const GdkEventKey* gdkEvent = static_cast(anEvent.mPluginEvent); From f0a31f1b238ca7ab1f5dea6a2541b70ac0b5e442 Mon Sep 17 00:00:00 2001 From: Bevis Tseng Date: Wed, 20 Dec 2017 16:46:24 +0800 Subject: [PATCH 06/32] Bug 1415793 - Check the removal of a tab until next tick. r=rpl --HG-- extra : rebase_source : 2a4937ec1816cdd943c6d15de2b34a73e8890693 --- .../test/mochitest/test_ext_activeTab_permission.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mobile/android/components/extensions/test/mochitest/test_ext_activeTab_permission.html b/mobile/android/components/extensions/test/mochitest/test_ext_activeTab_permission.html index e28afc0df505..34634fe063f7 100644 --- a/mobile/android/components/extensions/test/mochitest/test_ext_activeTab_permission.html +++ b/mobile/android/components/extensions/test/mochitest/test_ext_activeTab_permission.html @@ -315,7 +315,7 @@ add_task(async function test_activeTab_pageAction_popup() { const popupTabId = popupTab.id; let onceTabClosed = new Promise(resolve => { - BrowserApp.deck.addEventListener("TabClose", resolve, {once: true}); + BrowserApp.deck.addEventListener("TabClose", () => setTimeout(resolve, 0), {once: true}); }); // Switch to the parent tab of the popup tab. @@ -444,7 +444,7 @@ add_task(async function test_activeTab_browserAction_popup() { const popupTabId = popupTab.id; let onceTabClosed = new Promise(resolve => { - BrowserApp.deck.addEventListener("TabClose", resolve, {once: true}); + BrowserApp.deck.addEventListener("TabClose", () => setTimeout(resolve, 0), {once: true}); }); // Switch to the parent tab of the popup tab. From 9a70ac20fbf366b8fc2c67c63e484e53f13bca85 Mon Sep 17 00:00:00 2001 From: Jon Coppeard Date: Wed, 20 Dec 2017 11:06:23 +0000 Subject: [PATCH 07/32] Bug 1420925 - Update JS module tests now that repeated instantiation failures of a module are no longer required to throw the same value r=jgraham --- .../module/instantiation-error-1.html.ini | 3 --- .../module/instantiation-error-2.html.ini | 3 --- .../module/instantiation-error-3.html.ini | 3 +-- .../module/instantiation-error-4.html.ini | 3 --- .../module/instantiation-error-5.html.ini | 3 --- .../module/instantiation-error-1.html | 18 ++++++++++-------- .../module/instantiation-error-2.html | 18 ++++++++++-------- .../module/instantiation-error-3.html | 18 ++++++++++-------- .../module/instantiation-error-4.html | 16 +++++++++------- .../module/instantiation-error-5.html | 18 ++++++++++-------- 10 files changed, 50 insertions(+), 53 deletions(-) delete mode 100644 testing/web-platform/meta/html/semantics/scripting-1/the-script-element/module/instantiation-error-1.html.ini delete mode 100644 testing/web-platform/meta/html/semantics/scripting-1/the-script-element/module/instantiation-error-2.html.ini delete mode 100644 testing/web-platform/meta/html/semantics/scripting-1/the-script-element/module/instantiation-error-4.html.ini delete mode 100644 testing/web-platform/meta/html/semantics/scripting-1/the-script-element/module/instantiation-error-5.html.ini diff --git a/testing/web-platform/meta/html/semantics/scripting-1/the-script-element/module/instantiation-error-1.html.ini b/testing/web-platform/meta/html/semantics/scripting-1/the-script-element/module/instantiation-error-1.html.ini deleted file mode 100644 index e39049137658..000000000000 --- a/testing/web-platform/meta/html/semantics/scripting-1/the-script-element/module/instantiation-error-1.html.ini +++ /dev/null @@ -1,3 +0,0 @@ -[instantiation-error-1.html] - [Test that missing exports lead to SyntaxError events on window and load events on script, and that exceptions are remembered] - expected: FAIL diff --git a/testing/web-platform/meta/html/semantics/scripting-1/the-script-element/module/instantiation-error-2.html.ini b/testing/web-platform/meta/html/semantics/scripting-1/the-script-element/module/instantiation-error-2.html.ini deleted file mode 100644 index 0bc9a7349e74..000000000000 --- a/testing/web-platform/meta/html/semantics/scripting-1/the-script-element/module/instantiation-error-2.html.ini +++ /dev/null @@ -1,3 +0,0 @@ -[instantiation-error-2.html] - [Test that missing exports lead to SyntaxError events on window and load events on script, and that exceptions are remembered] - expected: FAIL diff --git a/testing/web-platform/meta/html/semantics/scripting-1/the-script-element/module/instantiation-error-3.html.ini b/testing/web-platform/meta/html/semantics/scripting-1/the-script-element/module/instantiation-error-3.html.ini index e96a3908704f..d07e1769fb33 100644 --- a/testing/web-platform/meta/html/semantics/scripting-1/the-script-element/module/instantiation-error-3.html.ini +++ b/testing/web-platform/meta/html/semantics/scripting-1/the-script-element/module/instantiation-error-3.html.ini @@ -1,3 +1,2 @@ [instantiation-error-3.html] - [Test that unresolvable cycles lead to SyntaxError events on window and load events on script, and that exceptions are remembered] - expected: FAIL + disabled: bug 1426195 diff --git a/testing/web-platform/meta/html/semantics/scripting-1/the-script-element/module/instantiation-error-4.html.ini b/testing/web-platform/meta/html/semantics/scripting-1/the-script-element/module/instantiation-error-4.html.ini deleted file mode 100644 index 55ed20ec543e..000000000000 --- a/testing/web-platform/meta/html/semantics/scripting-1/the-script-element/module/instantiation-error-4.html.ini +++ /dev/null @@ -1,3 +0,0 @@ -[instantiation-error-4.html] - [Test that loading a graph in which a module is already errored results in that module's error.] - expected: FAIL diff --git a/testing/web-platform/meta/html/semantics/scripting-1/the-script-element/module/instantiation-error-5.html.ini b/testing/web-platform/meta/html/semantics/scripting-1/the-script-element/module/instantiation-error-5.html.ini deleted file mode 100644 index 90715158806c..000000000000 --- a/testing/web-platform/meta/html/semantics/scripting-1/the-script-element/module/instantiation-error-5.html.ini +++ /dev/null @@ -1,3 +0,0 @@ -[instantiation-error-5.html] - [Test that loading a graph in which a module is already errored results in that module's error.] - expected: FAIL diff --git a/testing/web-platform/tests/html/semantics/scripting-1/the-script-element/module/instantiation-error-1.html b/testing/web-platform/tests/html/semantics/scripting-1/the-script-element/module/instantiation-error-1.html index efdf5879fce9..57b40f5baafb 100644 --- a/testing/web-platform/tests/html/semantics/scripting-1/the-script-element/module/instantiation-error-1.html +++ b/testing/web-platform/tests/html/semantics/scripting-1/the-script-element/module/instantiation-error-1.html @@ -6,17 +6,19 @@ + + + + diff --git a/dom/webidl/Console.webidl b/dom/webidl/Console.webidl index 0231ffd71ba3..1ca53cd18387 100644 --- a/dom/webidl/Console.webidl +++ b/dom/webidl/Console.webidl @@ -8,7 +8,7 @@ * https://console.spec.whatwg.org/#console-namespace */ -[Exposed=(Window,Worker,WorkerDebugger,Worklet), +[Exposed=(Window,Worker,WorkerDebugger,Worklet,System), ClassString="Console", ProtoObjectHack] namespace console { diff --git a/dom/workers/WorkerScope.cpp b/dom/workers/WorkerScope.cpp index f6cc2fd8b49d..0f7d6afa888a 100644 --- a/dom/workers/WorkerScope.cpp +++ b/dom/workers/WorkerScope.cpp @@ -136,7 +136,7 @@ WorkerGlobalScope::WrapObject(JSContext* aCx, JS::Handle aGivenProto) MOZ_CRASH("We should never get here!"); } -Console* +already_AddRefed WorkerGlobalScope::GetConsole(ErrorResult& aRv) { mWorkerPrivate->AssertIsOnWorkerThread(); @@ -148,7 +148,8 @@ WorkerGlobalScope::GetConsole(ErrorResult& aRv) } } - return mConsole; + RefPtr console = mConsole; + return console.forget(); } Crypto* @@ -1045,7 +1046,7 @@ WorkerDebuggerGlobalScope::SetConsoleEventHandler(JSContext* aCx, console->SetConsoleEventHandler(aHandler); } -Console* +already_AddRefed WorkerDebuggerGlobalScope::GetConsole(ErrorResult& aRv) { mWorkerPrivate->AssertIsOnWorkerThread(); @@ -1058,7 +1059,8 @@ WorkerDebuggerGlobalScope::GetConsole(ErrorResult& aRv) } } - return mConsole; + RefPtr console = mConsole; + return console.forget(); } void diff --git a/dom/workers/WorkerScope.h b/dom/workers/WorkerScope.h index 5d263b71eaf3..627ef37b5c6f 100644 --- a/dom/workers/WorkerScope.h +++ b/dom/workers/WorkerScope.h @@ -92,7 +92,7 @@ public: return this; } - Console* + already_AddRefed GetConsole(ErrorResult& aRv); Console* @@ -410,7 +410,7 @@ public: SetConsoleEventHandler(JSContext* aCx, AnyCallback* aHandler, ErrorResult& aRv); - Console* + already_AddRefed GetConsole(ErrorResult& aRv); Console* diff --git a/dom/worklet/WorkletGlobalScope.cpp b/dom/worklet/WorkletGlobalScope.cpp index 91540ab299b3..25637431ad65 100644 --- a/dom/worklet/WorkletGlobalScope.cpp +++ b/dom/worklet/WorkletGlobalScope.cpp @@ -54,7 +54,7 @@ WorkletGlobalScope::WrapObject(JSContext* aCx, JS::Handle aGivenProto return nullptr; } -Console* +already_AddRefed WorkletGlobalScope::GetConsole(ErrorResult& aRv) { if (!mConsole) { @@ -64,7 +64,8 @@ WorkletGlobalScope::GetConsole(ErrorResult& aRv) } } - return mConsole; + RefPtr console = mConsole; + return console.forget(); } void diff --git a/dom/worklet/WorkletGlobalScope.h b/dom/worklet/WorkletGlobalScope.h index 6ccf0d1ee3ba..1e81d6a66631 100644 --- a/dom/worklet/WorkletGlobalScope.h +++ b/dom/worklet/WorkletGlobalScope.h @@ -54,7 +54,7 @@ public: return GetWrapper(); } - Console* + already_AddRefed GetConsole(ErrorResult& aRv); void From 4d402775e1e437487ada80ecf8b8df54a1461af7 Mon Sep 17 00:00:00 2001 From: Andrea Marchesini Date: Wed, 20 Dec 2017 14:35:34 +0100 Subject: [PATCH 11/32] Bug 1425463 - Expose Console API to JSM - xpcshell test, r=smaug --- dom/console/moz.build | 1 + dom/console/tests/xpcshell/test_basic.js | 31 ++++++++++++++++++++++++ dom/console/tests/xpcshell/xpcshell.ini | 5 ++++ 3 files changed, 37 insertions(+) create mode 100644 dom/console/tests/xpcshell/test_basic.js create mode 100644 dom/console/tests/xpcshell/xpcshell.ini diff --git a/dom/console/moz.build b/dom/console/moz.build index 84986760e5d1..4612c20c2a44 100644 --- a/dom/console/moz.build +++ b/dom/console/moz.build @@ -44,5 +44,6 @@ LOCAL_INCLUDES += [ MOCHITEST_MANIFESTS += [ 'tests/mochitest.ini' ] MOCHITEST_CHROME_MANIFESTS += [ 'tests/chrome.ini' ] +XPCSHELL_TESTS_MANIFESTS += ['tests/xpcshell/xpcshell.ini'] FINAL_LIBRARY = 'xul' diff --git a/dom/console/tests/xpcshell/test_basic.js b/dom/console/tests/xpcshell/test_basic.js new file mode 100644 index 000000000000..a394674b80ce --- /dev/null +++ b/dom/console/tests/xpcshell/test_basic.js @@ -0,0 +1,31 @@ +/* Any copyright is dedicated to the Public Domain. + http://creativecommons.org/publicdomain/zero/1.0/ */ + +Components.utils.import("resource://gre/modules/Services.jsm"); + +add_task(async function() { + do_check_true("console" in this); + + let p = new Promise(resolve => { + function consoleListener() { + Services.obs.addObserver(this, "console-api-log-event"); + } + + consoleListener.prototype = { + observe: function(aSubject, aTopic, aData) { + let obj = aSubject.wrappedJSObject; + do_check_true(obj.arguments[0] === 42, "Message received!"); + do_check_true(obj.ID === "jsm", "The ID is JSM"); + do_check_true(obj.innerID.endsWith("test_basic.js"), "The innerID matches"); + + Services.obs.removeObserver(this, "console-api-log-event"); + resolve(); + } + }; + + new consoleListener(); + }); + + console.log(42); + await p; +}); diff --git a/dom/console/tests/xpcshell/xpcshell.ini b/dom/console/tests/xpcshell/xpcshell.ini new file mode 100644 index 000000000000..cdfbf76ccaa5 --- /dev/null +++ b/dom/console/tests/xpcshell/xpcshell.ini @@ -0,0 +1,5 @@ +[DEFAULT] +head = +support-files = + +[test_basic.js] From 18a5250f02b3e35a6720ef216e025dff11b7d500 Mon Sep 17 00:00:00 2001 From: David Major Date: Wed, 20 Dec 2017 09:07:46 -0500 Subject: [PATCH 12/32] Bug 1425906: Rename LINK to LINKER throughout the build system. r=glandium Windows linkers give special meaning to getenv("LINK"), which makes `export LINK=...` in mozconfigs do unexpected things. --- build/moz.configure/toolchain.configure | 2 +- build/moz.configure/windows.configure | 4 ++-- config/config.mk | 2 +- config/rules.mk | 4 ++-- js/src/old-configure.in | 6 +++--- old-configure.in | 6 +++--- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/build/moz.configure/toolchain.configure b/build/moz.configure/toolchain.configure index 4fa668534b8a..922c06248796 100755 --- a/build/moz.configure/toolchain.configure +++ b/build/moz.configure/toolchain.configure @@ -1017,7 +1017,7 @@ def compiler(language, host_or_target, c_compiler=None, other_compiler=None, def is_msvc(compiler): return compiler.type == 'msvc' - imply_option('LINK', linker, reason='LD', when=is_msvc) + imply_option('LINKER', linker, reason='LD', when=is_msvc) return valid_compiler diff --git a/build/moz.configure/windows.configure b/build/moz.configure/windows.configure index e299e45e6c6b..0d684dfd9834 100644 --- a/build/moz.configure/windows.configure +++ b/build/moz.configure/windows.configure @@ -429,9 +429,9 @@ def valid_mt(path): set_config('MSMANIFEST_TOOL', depends(valid_mt)(lambda x: bool(x))) -link = check_prog('LINK', ('link.exe',), paths=vc_compiler_path) +link = check_prog('LINKER', ('link.exe',), paths=vc_compiler_path) -add_old_configure_assignment('LINK', link) +add_old_configure_assignment('LINKER', link) # Normally, we'd just have CC, etc. set to absolute paths, but the build system diff --git a/config/config.mk b/config/config.mk index 4b9d6400ebb1..dd382e223f22 100644 --- a/config/config.mk +++ b/config/config.mk @@ -418,7 +418,7 @@ EXPAND_LIBS_GEN = $(PYTHON) $(MOZILLA_DIR)/config/expandlibs_gen.py EXPAND_AR = $(EXPAND_LIBS_EXEC) --extract -- $(AR) EXPAND_CC = $(EXPAND_LIBS_EXEC) --uselist -- $(CC) EXPAND_CCC = $(EXPAND_LIBS_EXEC) --uselist -- $(CCC) -EXPAND_LINK = $(EXPAND_LIBS_EXEC) --uselist -- $(LINK) +EXPAND_LINK = $(EXPAND_LIBS_EXEC) --uselist -- $(LINKER) EXPAND_MKSHLIB_ARGS = --uselist ifdef SYMBOL_ORDER EXPAND_MKSHLIB_ARGS += --symbol-order $(SYMBOL_ORDER) diff --git a/config/rules.mk b/config/rules.mk index 4729df4fb2e8..ed56ca7bb695 100644 --- a/config/rules.mk +++ b/config/rules.mk @@ -591,7 +591,7 @@ endif $(HOST_PROGRAM): $(HOST_PROGOBJS) $(HOST_LIBS) $(HOST_EXTRA_DEPS) $(GLOBAL_DEPS) $(REPORT_BUILD) ifeq (_WINNT,$(GNU_CC)_$(HOST_OS_ARCH)) - $(EXPAND_LIBS_EXEC) -- $(LINK) -NOLOGO -OUT:$@ -PDB:$(HOST_PDBFILE) $(HOST_OBJS) $(WIN32_EXE_LDFLAGS) $(HOST_LDFLAGS) $(HOST_LIBS) $(HOST_EXTRA_LIBS) + $(EXPAND_LIBS_EXEC) -- $(LINKER) -NOLOGO -OUT:$@ -PDB:$(HOST_PDBFILE) $(HOST_OBJS) $(WIN32_EXE_LDFLAGS) $(HOST_LDFLAGS) $(HOST_LIBS) $(HOST_EXTRA_LIBS) ifdef MSMANIFEST_TOOL @if test -f $@.manifest; then \ if test -f '$(srcdir)/$@.manifest'; then \ @@ -650,7 +650,7 @@ endif $(HOST_SIMPLE_PROGRAMS): host_%$(HOST_BIN_SUFFIX): host_%.$(OBJ_SUFFIX) $(HOST_LIBS) $(HOST_EXTRA_DEPS) $(GLOBAL_DEPS) $(REPORT_BUILD) ifeq (WINNT_,$(HOST_OS_ARCH)_$(GNU_CC)) - $(EXPAND_LIBS_EXEC) -- $(LINK) -NOLOGO -OUT:$@ -PDB:$(HOST_PDBFILE) $< $(WIN32_EXE_LDFLAGS) $(HOST_LIBS) $(HOST_EXTRA_LIBS) + $(EXPAND_LIBS_EXEC) -- $(LINKER) -NOLOGO -OUT:$@ -PDB:$(HOST_PDBFILE) $< $(WIN32_EXE_LDFLAGS) $(HOST_LIBS) $(HOST_EXTRA_LIBS) else ifneq (,$(HOST_CPPSRCS)$(USE_HOST_CXX)) $(EXPAND_LIBS_EXEC) -- $(HOST_CXX) $(HOST_OUTOPTION)$@ $(HOST_CXX_LDFLAGS) $< $(HOST_LIBS) $(HOST_EXTRA_LIBS) diff --git a/js/src/old-configure.in b/js/src/old-configure.in index 6a9016007c01..5935ec39d7ba 100644 --- a/js/src/old-configure.in +++ b/js/src/old-configure.in @@ -207,7 +207,7 @@ case "$target" in AC_SUBST(MSVC_CXX_RUNTIME_DLL) # Check linker version - _LD_FULL_VERSION=`"${LINK}" -v 2>&1 | sed -nre "$_MSVC_VER_FILTER"` + _LD_FULL_VERSION=`"${LINKER}" -v 2>&1 | sed -nre "$_MSVC_VER_FILTER"` _LD_MAJOR_VERSION=`echo ${_LD_FULL_VERSION} | $AWK -F\. '{ print $1 }'` if test "$_LD_MAJOR_VERSION" != "$_CC_SUITE"; then AC_MSG_ERROR([The linker major version, $_LD_FULL_VERSION, does not match the compiler suite version, $_CC_SUITE.]) @@ -675,8 +675,8 @@ case "$target" in RANLIB='echo not_ranlib' STRIP='echo not_strip' PKG_SKIP_STRIP=1 - MKSHLIB='$(LINK) -NOLOGO -DLL -OUT:$@ -PDB:$(LINK_PDBFILE) $(DSO_LDOPTS)' - MKCSHLIB='$(LINK) -NOLOGO -DLL -OUT:$@ -PDB:$(LINK_PDBFILE) $(DSO_LDOPTS)' + MKSHLIB='$(LINKER) -NOLOGO -DLL -OUT:$@ -PDB:$(LINK_PDBFILE) $(DSO_LDOPTS)' + MKCSHLIB='$(LINKER) -NOLOGO -DLL -OUT:$@ -PDB:$(LINK_PDBFILE) $(DSO_LDOPTS)' WIN32_SUBSYSTEM_VERSION=6.01 WIN32_CONSOLE_EXE_LDFLAGS=-SUBSYSTEM:CONSOLE,$WIN32_SUBSYSTEM_VERSION WIN32_GUI_EXE_LDFLAGS=-SUBSYSTEM:WINDOWS,$WIN32_SUBSYSTEM_VERSION diff --git a/old-configure.in b/old-configure.in index ae18382ef6eb..404bf96ed720 100644 --- a/old-configure.in +++ b/old-configure.in @@ -243,7 +243,7 @@ case "$target" in fi # Check linker version - _LD_FULL_VERSION=`"${LINK}" -v 2>&1 | sed -nre "$_MSVC_VER_FILTER"` + _LD_FULL_VERSION=`"${LINKER}" -v 2>&1 | sed -nre "$_MSVC_VER_FILTER"` _LD_MAJOR_VERSION=`echo ${_LD_FULL_VERSION} | $AWK -F\. '{ print $1 }'` if test "$_LD_MAJOR_VERSION" != "$_CC_SUITE"; then AC_MSG_ERROR([The linker major version, $_LD_FULL_VERSION, does not match the compiler suite version, $_CC_SUITE.]) @@ -901,8 +901,8 @@ case "$target" in RANLIB='echo not_ranlib' STRIP='echo not_strip' PKG_SKIP_STRIP=1 - MKSHLIB='$(LINK) -NOLOGO -DLL -OUT:$@ -PDB:$(LINK_PDBFILE) $(DSO_LDOPTS)' - MKCSHLIB='$(LINK) -NOLOGO -DLL -OUT:$@ -PDB:$(LINK_PDBFILE) $(DSO_LDOPTS)' + MKSHLIB='$(LINKER) -NOLOGO -DLL -OUT:$@ -PDB:$(LINK_PDBFILE) $(DSO_LDOPTS)' + MKCSHLIB='$(LINKER) -NOLOGO -DLL -OUT:$@ -PDB:$(LINK_PDBFILE) $(DSO_LDOPTS)' WIN32_SUBSYSTEM_VERSION=6.01 WIN32_CONSOLE_EXE_LDFLAGS=-SUBSYSTEM:CONSOLE,$WIN32_SUBSYSTEM_VERSION WIN32_GUI_EXE_LDFLAGS=-SUBSYSTEM:WINDOWS,$WIN32_SUBSYSTEM_VERSION From df53d0fe58ef549c581fabe1080725ee3bd5f074 Mon Sep 17 00:00:00 2001 From: Kershaw Chang Date: Wed, 20 Dec 2017 00:08:00 +0200 Subject: [PATCH 13/32] Bug 1425512 - Make the sequence of requests more determinate, r=mayhemer This test is aimed to check whether the order that http server gets requests is the same as the order in the client's pending queue. However, even if the transactions are dispatched according to the order in pending queue, it doesn't mean the server can get the request in the same order. This is because the transaction is really dispatched to a connection when nsHalfOpenSocket::OnOutputStreamReady() is called. The order may not be always the same as the pending queue. Hence, this patch processes the dummy http request once at the time when the previous request's OnStopRequest() is called. This can force the client dispatch only one transaction at the time and make the behavior of this test more predictable. --HG-- extra : rebase_source : 5f4631ecabdf1f36352a80fbe1939b54348ab682 --- netwerk/test/unit/test_bug1355539_http1.js | 38 ++++++++++++++++------ 1 file changed, 28 insertions(+), 10 deletions(-) diff --git a/netwerk/test/unit/test_bug1355539_http1.js b/netwerk/test/unit/test_bug1355539_http1.js index 59f725805776..71d6278fae31 100644 --- a/netwerk/test/unit/test_bug1355539_http1.js +++ b/netwerk/test/unit/test_bug1355539_http1.js @@ -27,6 +27,8 @@ server.start(-1); var baseURL = "http://localhost:" + server.identity.primaryPort + "/"; var maxConnections = 0; var debug = false; +var dummyResponseQueue = new Array(); +var responseQueue = new Array(); function log(msg) { if (!debug) { @@ -48,10 +50,10 @@ function serverStopListener() { server.stop(); } -function createHttpRequest(requestId, priority, isBlocking) { +function createHttpRequest(requestId, priority, isBlocking, callback) { let uri = baseURL; var chan = make_channel(uri); - var listner = new HttpResponseListener(requestId); + var listner = new HttpResponseListener(requestId, callback); chan.setRequestHeader("X-ID", requestId, false); chan.setRequestHeader("Cache-control", "no-store", false); chan.QueryInterface(Ci.nsISupportsPriority).priority = priority; @@ -63,10 +65,10 @@ function createHttpRequest(requestId, priority, isBlocking) { log("Create http request id=" + requestId); } -function setup_dummyHttpRequests() { +function setup_dummyHttpRequests(callback) { log("setup_dummyHttpRequests"); for (var i = 0; i < maxConnections ; i++) { - createHttpRequest(i, i, false); + createHttpRequest(i, i, false, callback); do_test_pending(); } } @@ -99,9 +101,10 @@ function check_response_id(responses) } } -function HttpResponseListener(id) +function HttpResponseListener(id, onStopCallback) { this.id = id + this.stopCallback = onStopCallback; }; HttpResponseListener.prototype = @@ -115,10 +118,12 @@ HttpResponseListener.prototype = onStopRequest: function (request, ctx, status) { log("STOP id=" + this.id); do_test_finished(); + if (this.stopCallback) { + this.stopCallback(); + } } }; -var responseQueue = new Array(); function setup_http_server() { log("setup_http_server"); @@ -134,13 +139,18 @@ function setup_http_server() response.processAsync(); response.setHeader("X-ID", id); - responseQueue.push(response); - if (responseQueue.length == maxConnections && !allDummyHttpRequestReceived) { + if (!allDummyHttpRequestReceived) { + dummyResponseQueue.push(response); + } else { + responseQueue.push(response); + } + + if (dummyResponseQueue.length == maxConnections) { log("received all dummy http requets"); allDummyHttpRequestReceived = true; setup_HttpRequests(); - processResponses(); + processDummyResponse(); } else if (responseQueue.length == maxConnections) { log("received all http requets"); check_response_id(responseQueue); @@ -155,6 +165,14 @@ function setup_http_server() } +function processDummyResponse() { + if (!dummyResponseQueue.length) { + return; + } + var resposne = dummyResponseQueue.pop(); + resposne.finish(); +} + function processResponses() { while (responseQueue.length) { var resposne = responseQueue.pop(); @@ -164,5 +182,5 @@ function processResponses() { function run_test() { setup_http_server(); - setup_dummyHttpRequests(); + setup_dummyHttpRequests(processDummyResponse); } From 7b5a7a03c6a0c660318757510529902ab37ed8dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20Qu=C3=A8ze?= Date: Tue, 19 Dec 2017 23:40:40 +0100 Subject: [PATCH 14/32] Bug 1394914 - toolbars no longer need to wait for xul overlays to load before initializing CustomizableUI icons (avoid sidebar icon flickering), r=Gijs. --- .../performance/browser_startup_flicker.js | 7 ----- .../performance/browser_windowopen_flicker.js | 7 ----- .../performance/browser_windowopen_reflows.js | 12 ++++++++- .../customizableui/content/toolbar.xml | 26 +++---------------- 4 files changed, 14 insertions(+), 38 deletions(-) diff --git a/browser/base/content/test/performance/browser_startup_flicker.js b/browser/base/content/test/performance/browser_startup_flicker.js index 103f8d7791ab..955dd88a200a 100644 --- a/browser/base/content/test/performance/browser_startup_flicker.js +++ b/browser/base/content/test/performance/browser_startup_flicker.js @@ -48,13 +48,6 @@ add_task(async function() { inRange(r.x1, width * .75, width * .9) }, - {name: "bug 1394914 - sidebar toolbar icon should be visible at first paint", - condition: r => r.h == 13 && inRange(r.w, 14, 16) && // icon size - inRange(r.y1, 40, 80) && // in the toolbar - // near the right end of screen - inRange(r.x1, width - 100, width - 50) - }, - {name: "bug 1403648 - urlbar should be focused at first paint", condition: r => inRange(r.y2, 60, 80) && // in the toolbar // taking 50% to 75% of the window width diff --git a/browser/base/content/test/performance/browser_windowopen_flicker.js b/browser/base/content/test/performance/browser_windowopen_flicker.js index 35780c0d9c42..a6d72b9cd0fa 100644 --- a/browser/base/content/test/performance/browser_windowopen_flicker.js +++ b/browser/base/content/test/performance/browser_windowopen_flicker.js @@ -98,13 +98,6 @@ add_task(async function() { inRange(r.x1, width * .75, width * .9) }, - {name: "bug 1394914 - sidebar toolbar icon should be visible at first paint", - condition: r => r.h == 13 && inRange(r.w, 14, 16) && // icon size - inRange(r.y1, 40, 80) && // in the toolbar - // near the right end of screen - inRange(r.x1, width - 100, width - 50) - }, - {name: "bug 1403648 - urlbar should be focused at first paint", condition: r => inRange(r.y2, 60, 80) && // in the toolbar // taking 50% to 75% of the window width diff --git a/browser/base/content/test/performance/browser_windowopen_reflows.js b/browser/base/content/test/performance/browser_windowopen_reflows.js index f4b16a498c30..6f20fa68e55c 100644 --- a/browser/base/content/test/performance/browser_windowopen_reflows.js +++ b/browser/base/content/test/performance/browser_windowopen_reflows.js @@ -12,7 +12,17 @@ * See https://developer.mozilla.org/en-US/Firefox/Performance_best_practices_for_Firefox_fe_engineers * for tips on how to do that. */ -const EXPECTED_REFLOWS = []; +const EXPECTED_REFLOWS = [ + { + stack: [ + "onOverflow@resource:///modules/CustomizableUI.jsm", + "init@resource:///modules/CustomizableUI.jsm", + "observe@resource:///modules/CustomizableUI.jsm", + "_delayedStartup@chrome://browser/content/browser.js", + ], + times: 2, // This number should only ever go down - never up. + }, +]; if (Services.appinfo.OS == "WINNT") { EXPECTED_REFLOWS.push( diff --git a/browser/components/customizableui/content/toolbar.xml b/browser/components/customizableui/content/toolbar.xml index 9a7780c4a7bc..e8f61aa44d3a 100644 --- a/browser/components/customizableui/content/toolbar.xml +++ b/browser/components/customizableui/content/toolbar.xml @@ -18,33 +18,14 @@ - - - node.getAttribute("skipintoolbarset") != "true" && node.id) .map(node => node.id); CustomizableUI.registerToolbarNode(this, children); - ]]> - + ]]> From 266c2b2aeac9e7f8b47e89e2589d65dd2704793a Mon Sep 17 00:00:00 2001 From: Dragana Damjanovic Date: Wed, 20 Dec 2017 15:40:07 +0100 Subject: [PATCH 15/32] Bug 1402879 - Make small changes to TFO: telemetry and use of backup socket that already has started. r-mcmanus --- netwerk/base/TCPFastOpenLayer.cpp | 2 + netwerk/base/TCPFastOpenLayer.h | 44 ++++++++++++-- netwerk/base/nsSocketTransport2.cpp | 6 +- netwerk/protocol/http/nsHttpConnection.cpp | 17 ++++-- netwerk/protocol/http/nsHttpConnectionMgr.cpp | 59 ++++++++++++------- toolkit/components/telemetry/Histograms.json | 10 ++-- 6 files changed, 99 insertions(+), 39 deletions(-) diff --git a/netwerk/base/TCPFastOpenLayer.cpp b/netwerk/base/TCPFastOpenLayer.cpp index c4ab5249bf12..c412aa4909f3 100644 --- a/netwerk/base/TCPFastOpenLayer.cpp +++ b/netwerk/base/TCPFastOpenLayer.cpp @@ -395,6 +395,7 @@ TCPFastOpenFinish(PRFileDesc *fd, PRErrorCode &err, // We will disable Fast Open. SOCKET_LOG(("TCPFastOpenFinish - sendto not implemented.\n")); fastOpenNotSupported = true; + tfoStatus = TFO_DISABLED; } } else { // We have some data ready in the buffer we will send it with the syn @@ -432,6 +433,7 @@ TCPFastOpenFinish(PRFileDesc *fd, PRErrorCode &err, } else { result = PR_GetError(); } + tfoStatus = TFO_DISABLED; } else { tfoStatus = TFO_TRIED; } diff --git a/netwerk/base/TCPFastOpenLayer.h b/netwerk/base/TCPFastOpenLayer.h index 5d8b1737b15c..764a35e86122 100644 --- a/netwerk/base/TCPFastOpenLayer.h +++ b/netwerk/base/TCPFastOpenLayer.h @@ -20,17 +20,51 @@ namespace net { **/ typedef enum { - TFO_NOT_TRIED, - TFO_TRIED, - TFO_DATA_SENT, + TFO_NOT_SET, // This is only as a control. + // A connection not using TFO will have the TFO state set upon + // connection creation (in nsHalfOpenSocket::SetupConn). + // A connection using TFO will have the TFO state set after + // the connection is established or canceled. + TFO_UNKNOWN, // This is before the primary socket is built, i.e. before + // TCPFastOpenFinish is called. + TFO_DISABLED, // tfo is disabled because of a tfo error on a previous + // connection to the host (i.e. !mEnt->mUseFastOpen). + // If TFO is not supported by the OS, it is disabled by + // the pref or too many consecutive errors occurred, this value + // is not reported. This is set before StartFastOpen is called. + TFO_DISABLED_CONNECT, // Connection is using CONNECT. This is set before + // StartFastOpen is called. + // The following 3 are set just after TCPFastOpenFinish. + TFO_NOT_TRIED, // For some reason TCPFastOpenLayer does not have any data to + // send with the syn packet. This should never happen. + TFO_TRIED, // TCP has sent a TFO cookie request. + TFO_DATA_SENT, // On Linux, TCP has send data as well. (On Linux we do not + // know whether data has been accepted). + // On Windows, TCP has send data or only a TFO cookie request + // and the data or TFO cookie has been accepted by the server. + // The following value is only used on windows and is set after + // PR_ConnectContinue. That is the point when we know if TFO data was been + // accepted. + TFO_DATA_COOKIE_NOT_ACCEPTED, // This is only on Windows. TFO data or TFO + // cookie request has not been accepted. + // The following 3 are set during socket error recover + // (nsSocketTransport::RecoverFromError). TFO_FAILED_CONNECTION_REFUSED, TFO_FAILED_NET_TIMEOUT, TFO_FAILED_UNKNOW_ERROR, - TFO_FAILED_BACKUP_CONNECTION, + // The following 4 are set when backup connection finishes before the primary + // connection. + TFO_FAILED_BACKUP_CONNECTION_TFO_NOT_TRIED, + TFO_FAILED_BACKUP_CONNECTION_TFO_TRIED, + TFO_FAILED_BACKUP_CONNECTION_TFO_DATA_SENT, + TFO_FAILED_BACKUP_CONNECTION_TFO_DATA_COOKIE_NOT_ACCEPTED, + // The following 4 are set when the recovery connection fails as well. TFO_FAILED_CONNECTION_REFUSED_NO_TFO_FAILED_TOO, - TFO_FAILED_NET_TIMEOUT__NO_TFO_FAILED_TOO, + TFO_FAILED_NET_TIMEOUT_NO_TFO_FAILED_TOO, TFO_FAILED_UNKNOW_ERROR_NO_TFO_FAILED_TOO, TFO_FAILED_BACKUP_CONNECTION_NO_TFO_FAILED_TOO, + TFO_BACKUP_CONN, // This is a backup conn, for a halfOpenSock that was used + // TFO. TFO_FAILED, TFO_HTTP // TFO is disabled for non-secure connections. } TFOResult; diff --git a/netwerk/base/nsSocketTransport2.cpp b/netwerk/base/nsSocketTransport2.cpp index e74f866b0081..96f759cade54 100644 --- a/netwerk/base/nsSocketTransport2.cpp +++ b/netwerk/base/nsSocketTransport2.cpp @@ -799,7 +799,7 @@ nsSocketTransport::nsSocketTransport() , mKeepaliveProbeCount(-1) , mFastOpenCallback(nullptr) , mFastOpenLayerHasBufferedData(false) - , mFastOpenStatus(TFO_NOT_TRIED) + , mFastOpenStatus(TFO_NOT_SET) , mFirstRetryError(NS_OK) , mDoNotRetryToConnect(false) { @@ -2214,9 +2214,9 @@ nsSocketTransport::OnSocketReady(PRFileDesc *fd, int16_t outFlags) BOOL option = 0; int len = sizeof(option); PRInt32 rv = getsockopt((SOCKET)osfd, IPPROTO_TCP, TCP_FASTOPEN, (char*)&option, &len); - if ((rv != 0) && !option) { + if (!rv && !option) { // On error, I will let the normal necko paths pickup the error. - mFastOpenCallback->SetFastOpenStatus(TFO_NOT_TRIED); + mFastOpenCallback->SetFastOpenStatus(TFO_DATA_COOKIE_NOT_ACCEPTED); } } #endif diff --git a/netwerk/protocol/http/nsHttpConnection.cpp b/netwerk/protocol/http/nsHttpConnection.cpp index ec2ced9339cb..0f11734f86a3 100644 --- a/netwerk/protocol/http/nsHttpConnection.cpp +++ b/netwerk/protocol/http/nsHttpConnection.cpp @@ -87,7 +87,7 @@ nsHttpConnection::nsHttpConnection() , mEarlyDataNegotiated(false) , mDid0RTTSpdy(false) , mFastOpen(false) - , mFastOpenStatus(TFO_NOT_TRIED) + , mFastOpenStatus(TFO_NOT_SET) , mForceSendDuringFastOpenPending(false) , mReceivedSocketWouldBlockDuringFastOpen(false) { @@ -127,12 +127,12 @@ nsHttpConnection::~nsHttpConnection() if ((mFastOpenStatus != TFO_FAILED) && (mFastOpenStatus != TFO_HTTP) && - ((mFastOpenStatus != TFO_NOT_TRIED) || + ((mFastOpenStatus != TFO_DISABLED) || gHttpHandler->UseFastOpen())) { // TFO_FAILED will be reported in the replacement connection with more // details. // Otherwise report only if TFO is enabled and supported. - Telemetry::Accumulate(Telemetry::TCP_FAST_OPEN_2, mFastOpenStatus); + Telemetry::Accumulate(Telemetry::TCP_FAST_OPEN_3, mFastOpenStatus); } } @@ -2446,11 +2446,20 @@ void nsHttpConnection::SetFastOpenStatus(uint8_t tfoStatus) { mFastOpenStatus = tfoStatus; if ((mFastOpenStatus >= TFO_FAILED_CONNECTION_REFUSED) && + (mFastOpenStatus <= TFO_FAILED_BACKUP_CONNECTION_TFO_DATA_COOKIE_NOT_ACCEPTED) && mSocketTransport) { nsresult firstRetryError; if (NS_SUCCEEDED(mSocketTransport->GetFirstRetryError(&firstRetryError)) && (NS_FAILED(firstRetryError))) { - mFastOpenStatus = tfoStatus + 4; + if ((mFastOpenStatus >= TFO_FAILED_BACKUP_CONNECTION_TFO_NOT_TRIED) && + (mFastOpenStatus <= TFO_FAILED_BACKUP_CONNECTION_TFO_DATA_COOKIE_NOT_ACCEPTED)) { + mFastOpenStatus = TFO_FAILED_BACKUP_CONNECTION_NO_TFO_FAILED_TOO; + } else { + // We add +7 to tranform TFO_FAILED_CONNECTION_REFUSED into + // TFO_FAILED_CONNECTION_REFUSED_NO_TFO_FAILED_TOO, etc. + // If the list in TCPFastOpenLayer.h changes please addapt +7. + mFastOpenStatus = tfoStatus + 7; + } } } } diff --git a/netwerk/protocol/http/nsHttpConnectionMgr.cpp b/netwerk/protocol/http/nsHttpConnectionMgr.cpp index 6229a403ce06..eee68d8bfef4 100644 --- a/netwerk/protocol/http/nsHttpConnectionMgr.cpp +++ b/netwerk/protocol/http/nsHttpConnectionMgr.cpp @@ -3875,7 +3875,7 @@ nsHalfOpenSocket::nsHalfOpenSocket(nsConnectionEntry *ent, } if (mEnt->mConnInfo->FirstHopSSL()) { - mFastOpenStatus = TFO_NOT_TRIED; + mFastOpenStatus = TFO_UNKNOWN; } else { mFastOpenStatus = TFO_HTTP; } @@ -3985,8 +3985,12 @@ nsHalfOpenSocket::SetupStreams(nsISocketTransport **transport, tmpFlags |= nsISocketTransport::DISABLE_RFC1918; } - if (!isBackup && mEnt->mUseFastOpen) { - socketTransport->SetFastOpenCallback(this); + if (!isBackup) { + if (mEnt->mUseFastOpen) { + socketTransport->SetFastOpenCallback(this); + } else { + mFastOpenStatus = TFO_DISABLED; + } } socketTransport->SetConnectionFlags(tmpFlags); @@ -4310,7 +4314,18 @@ nsHalfOpenSocket::OnOutputStreamReady(nsIAsyncOutputStream *out) mFastOpenInProgress = false; mConnectionNegotiatingFastOpen = nullptr; - mFastOpenStatus = TFO_FAILED_BACKUP_CONNECTION; + if (mFastOpenStatus == TFO_NOT_TRIED) { + mFastOpenStatus = TFO_FAILED_BACKUP_CONNECTION_TFO_NOT_TRIED; + } else if (mFastOpenStatus == TFO_TRIED) { + mFastOpenStatus = TFO_FAILED_BACKUP_CONNECTION_TFO_TRIED; + } else if (mFastOpenStatus == TFO_DATA_SENT) { + mFastOpenStatus = TFO_FAILED_BACKUP_CONNECTION_TFO_DATA_SENT; + } else { + // This is TFO_DATA_COOKIE_NOT_ACCEPTED (I think this cannot + // happened, because the primary connection will be already + // connected or in recovery and mFastOpenInProgress==false). + mFastOpenStatus = TFO_FAILED_BACKUP_CONNECTION_TFO_DATA_COOKIE_NOT_ACCEPTED; + } } nsresult rv = SetupConn(out, false); @@ -4332,6 +4347,8 @@ nsHalfOpenSocket::FastOpenEnabled() return false; } + MOZ_ASSERT(mEnt->mConnInfo->FirstHopSSL()); + // If mEnt is present this HalfOpen must be in the mHalfOpens, // but we want to be sure!!! if (!mEnt->mHalfOpens.Contains(this)) { @@ -4342,6 +4359,7 @@ nsHalfOpenSocket::FastOpenEnabled() // fast open was turned off. LOG(("nsHalfOpenSocket::FastEnabled - fast open was turned off.\n")); mEnt->mUseFastOpen = false; + mFastOpenStatus = TFO_DISABLED; return false; } // We can use FastOpen if we have a transaction or if it is ssl @@ -4350,25 +4368,11 @@ nsHalfOpenSocket::FastOpenEnabled() // the connection will be 100% ready for the next transaction to use it. // Make an exception for SSL tunneled HTTP proxy as the NullHttpTransaction // does not know how to drive Connect. - RefPtr info = FindTransactionHelper(false); - - if ((!info) && - (!mEnt->mConnInfo->FirstHopSSL() || mEnt->mConnInfo->UsingConnect())) { - LOG(("nsHalfOpenSocket::FastOpenEnabled - It is a connection without " - "transaction and first hop is not ssl.\n")); + if (mEnt->mConnInfo->UsingConnect()) { + LOG(("nsHalfOpenSocket::FastOpenEnabled - It is using Connect.")); + mFastOpenStatus = TFO_DISABLED_CONNECT; return false; } - - if ((info) && !mEnt->mConnInfo->FirstHopSSL()) { - // The following function call will check whether is possible to send - // data during fast open - if (!info->mTransaction->CanDo0RTT()) { - LOG(("nsHalfOpenSocket::FastOpenEnabled - it is not safe to restart " - "transaction.\n")); - return false; - } - } - return true; } @@ -4556,7 +4560,13 @@ nsHalfOpenSocket::SetFastOpenConnected(nsresult aError, bool aWillRetry) mStreamOut = nullptr; mStreamIn = nullptr; - Abandon(); + // If backup transport has already started put this HalfOpen back to + // mEnt list. + if (mBackupTransport) { + mFastOpenStatus = TFO_BACKUP_CONN; + mEnt->mHalfOpens.AppendElement(this); + gHttpHandler->ConnMgr()->mNumHalfOpenConns++; + } } mFastOpenInProgress = false; @@ -4576,6 +4586,7 @@ nsHttpConnectionMgr:: nsHalfOpenSocket::SetFastOpenStatus(uint8_t tfoStatus) { MOZ_ASSERT(mFastOpenInProgress); + mFastOpenStatus = tfoStatus; mConnectionNegotiatingFastOpen->SetFastOpenStatus(tfoStatus); mConnectionNegotiatingFastOpen->Transaction()->SetFastOpenStatus(tfoStatus); } @@ -4804,6 +4815,10 @@ nsHalfOpenSocket::SetupConn(nsIAsyncOutputStream *out, } } else { conn->SetFastOpenStatus(mFastOpenStatus); + mFastOpenStatus = TFO_BACKUP_CONN; // Set this to TFO_BACKUP_CONN so + // that if a backup connection is + // established we do not report + // values twice. } // If this halfOpenConn was speculative, but at the ende the conn got a diff --git a/toolkit/components/telemetry/Histograms.json b/toolkit/components/telemetry/Histograms.json index 88ae54a9b060..871f7bfc5be4 100644 --- a/toolkit/components/telemetry/Histograms.json +++ b/toolkit/components/telemetry/Histograms.json @@ -2423,14 +2423,14 @@ "description": "Stats about success rate of HTTP OMT request in content process, keyed by content policy.", "labels": ["success", "successMainThread", "failListener", "failListenerChain", "notRequested"] }, - "TCP_FAST_OPEN_2": { - "record_in_processes": ["main", "content"], + "TCP_FAST_OPEN_3": { + "record_in_processes": ["main"], "expires_in_version": "61", "kind": "enumerated", - "n_values": 16, - "description": "When a http connection is closed, track whether or not TCP Fast Open was used: 0=TFO_NOT_TRIED(There was no http connection and it was not TLS), 1=TFO_TRIED_NEGOTIATING, 2=TFO_DATA_SENT, 3=TFO_FAILED_CONNECTION_REFUSED, 4=TFO_FAILED_NET_TIMEOUT, 5=TFO_FAILED_UNKNOW_ERROR, 6=TFO_FAILED_BACKUP_CONNECTION, 7=TFO_FAILED_CONNECTION_REFUSED_NO_TFO_FAILED_TOO, 8=TFO_FAILED_NET_TIMEOUT__NO_TFO_FAILED_TOO, 9=TFO_FAILED_UNKNOW_ERROR_NO_TFO_FAILED_TOO, 10=TFO_FAILED_BACKUP_CONNECTION_NO_TFO_FAILED_TOO.", + "n_values": 32, + "description": "When a http connection is closed, track whether or not TCP Fast Open was used: 0=TFO_NOT_SET, 1=TFO_UNKNOWN, 2=TFO_DISABLED, 3=TFO_DISABLED_CONNECT, 4=TFO_NOT_TRIED, 5=TFO_TRIED, 6=TFO_DATA_SENT, 7=TFO_DATA_COOKIE_NOT_ACCEPTED, 8=TFO_FAILED_CONNECTION_REFUSED, 9=TFO_FAILED_NET_TIMEOUT, 10=TFO_FAILED_UNKNOW_ERROR, 11=TFO_FAILED_BACKUP_CONNECTION_TFO_NOT_TRIED, 12=TFO_FAILED_BACKUP_CONNECTION_TFO_TRIED, 13=TFO_FAILED_BACKUP_CONNECTION_TFO_DATA_SENT, 14=TFO_FAILED_BACKUP_CONNECTION_TFO_DATA_COOKIE_NOT_ACCEPTED, 15=TFO_FAILED_CONNECTION_REFUSED_NO_TFO_FAILED_TOO, 16=TFO_FAILED_NET_TIMEOUT__NO_TFO_FAILED_TOO, 17=TFO_FAILED_UNKNOW_ERROR_NO_TFO_FAILED_TOO, 18=TFO_FAILED_BACKUP_CONNECTION_NO_TFO_FAILED_TOO, 19=TFO_BACKUP_CONN. Please look at netwerk/base/TCPFastOpenLayer.h for more info", "alert_emails": ["necko@mozilla.com", "ddamjanovic@mozilla.com"], - "bug_numbers": [1390881] + "bug_numbers": [1402879] }, "TCP_FAST_OPEN_STATUS": { "record_in_processes": ["main", "content"], From 34afbed5d95c9e7a8cc71ca8483d46058cef8203 Mon Sep 17 00:00:00 2001 From: Dragana Damjanovic Date: Wed, 20 Dec 2017 15:56:28 +0100 Subject: [PATCH 16/32] Bug 1402811 - Collect telemetry on how often a backup connection wins. r=mcmanus --- netwerk/protocol/http/nsHttpConnectionMgr.cpp | 11 +++++++++++ netwerk/protocol/http/nsHttpConnectionMgr.h | 1 + toolkit/components/telemetry/Scalars.yaml | 15 +++++++++++++++ 3 files changed, 27 insertions(+) diff --git a/netwerk/protocol/http/nsHttpConnectionMgr.cpp b/netwerk/protocol/http/nsHttpConnectionMgr.cpp index eee68d8bfef4..051f7a1797b1 100644 --- a/netwerk/protocol/http/nsHttpConnectionMgr.cpp +++ b/netwerk/protocol/http/nsHttpConnectionMgr.cpp @@ -3855,6 +3855,7 @@ nsHalfOpenSocket::nsHalfOpenSocket(nsConnectionEntry *ent, , mHasConnected(false) , mPrimaryConnectedOK(false) , mBackupConnectedOK(false) + , mBackupConnStatsSet(false) , mFreeToUse(true) , mPrimaryStreamStatus(NS_OK) , mFastOpenInProgress(false) @@ -4328,6 +4329,16 @@ nsHalfOpenSocket::OnOutputStreamReady(nsIAsyncOutputStream *out) } } + if (((mFastOpenStatus == TFO_DISABLED) || + (mFastOpenStatus == TFO_HTTP)) && !mBackupConnStatsSet) { + // Collect telemetry for backup connection being faster than primary + // connection. We want to collect this telemetry only for cases where + // TFO is not used. + mBackupConnStatsSet = true; + Telemetry::ScalarSet(Telemetry::ScalarID::NETWORK_HTTP_BACKUP_CONN_WON, + (out == mBackupStreamOut)); + } + nsresult rv = SetupConn(out, false); if (mEnt) { mEnt->mDoNotDestroy = false; diff --git a/netwerk/protocol/http/nsHttpConnectionMgr.h b/netwerk/protocol/http/nsHttpConnectionMgr.h index 0d30882fa700..8942da964fd8 100644 --- a/netwerk/protocol/http/nsHttpConnectionMgr.h +++ b/netwerk/protocol/http/nsHttpConnectionMgr.h @@ -476,6 +476,7 @@ private: bool mPrimaryConnectedOK; bool mBackupConnectedOK; + bool mBackupConnStatsSet; // A nsHalfOpenSocket can be made for a concrete non-null transaction, // but the transaction can be dispatch to another connection. In that diff --git a/toolkit/components/telemetry/Scalars.yaml b/toolkit/components/telemetry/Scalars.yaml index 45c072503fa6..c8b471bbb9f7 100644 --- a/toolkit/components/telemetry/Scalars.yaml +++ b/toolkit/components/telemetry/Scalars.yaml @@ -1267,6 +1267,21 @@ screenshots: record_in_processes: - 'main' +network.http: + backup_conn_won: + bug_numbers: + - 1402811 + description: > + For connection where TFO has not be use, collect telemetry on whether the + backup connection or the primary connection was faster. + expires: "61" + kind: boolean + notification_emails: + - necko@mozilla.com + - ddamjanovic@mozilla.com + record_in_processes: + - 'main' + idb.type: persistent_count: bug_numbers: From 00a47a6f30c42f630672b50e327d7d5f47008fe6 Mon Sep 17 00:00:00 2001 From: Dragana Damjanovic Date: Wed, 20 Dec 2017 16:13:36 +0100 Subject: [PATCH 17/32] Bug 1422545 - Do not close connection between a httpChannelChild and its httpChannelParent if we need to divert to parent.r=mayhemer If UnknowDecoder is involved and the received content is short we will know whether we need to divert to parent only after OnStartRequest of the listener chain is called. Therefore do not do cleanup if we detect diversion. --- netwerk/protocol/http/HttpChannelChild.cpp | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/netwerk/protocol/http/HttpChannelChild.cpp b/netwerk/protocol/http/HttpChannelChild.cpp index 36c835f53a1f..d1b9e104e6b8 100644 --- a/netwerk/protocol/http/HttpChannelChild.cpp +++ b/netwerk/protocol/http/HttpChannelChild.cpp @@ -1100,6 +1100,19 @@ HttpChannelChild::OnStopRequest(const nsresult& channelStatus, // DoOnStopRequest() calls ReleaseListeners() } + // If unknownDecoder is involved and the received content is short we will + // know whether we need to divert to parent only after OnStopRequest of the + // listeners chain is called in DoOnStopRequest. At that moment + // unknownDecoder will call OnStartRequest of the real listeners of the + // channel including the OnStopRequest of UrlLoader which decides whether we + // need to divert to parent. + // If we are diverting to parent we should not do a cleanup. + if (mDivertingToParent) { + LOG(("HttpChannelChild::OnStopRequest - We are diverting to parent, " + "postpone cleaning up.")); + return; + } + CleanupBackgroundChannel(); // If there is a possibility we might want to write alt data to the cache From 58e7ba18e51d9b77b2282531fbcac0fdde881603 Mon Sep 17 00:00:00 2001 From: David Major Date: Wed, 20 Dec 2017 10:28:24 -0500 Subject: [PATCH 18/32] Bug 1426198: Skip the linker version check in lld builds. r=glandium --- js/src/old-configure.in | 18 ++++++++++++------ old-configure.in | 18 ++++++++++++------ 2 files changed, 24 insertions(+), 12 deletions(-) diff --git a/js/src/old-configure.in b/js/src/old-configure.in index 5935ec39d7ba..560f633abdeb 100644 --- a/js/src/old-configure.in +++ b/js/src/old-configure.in @@ -206,12 +206,18 @@ case "$target" in AC_SUBST(MSVC_C_RUNTIME_DLL) AC_SUBST(MSVC_CXX_RUNTIME_DLL) - # Check linker version - _LD_FULL_VERSION=`"${LINKER}" -v 2>&1 | sed -nre "$_MSVC_VER_FILTER"` - _LD_MAJOR_VERSION=`echo ${_LD_FULL_VERSION} | $AWK -F\. '{ print $1 }'` - if test "$_LD_MAJOR_VERSION" != "$_CC_SUITE"; then - AC_MSG_ERROR([The linker major version, $_LD_FULL_VERSION, does not match the compiler suite version, $_CC_SUITE.]) - fi + # Check linker version, except in lld builds + case "$LINKER" in + *lld*) + ;; + *) + _LD_FULL_VERSION=`"${LINKER}" -v 2>&1 | sed -nre "$_MSVC_VER_FILTER"` + _LD_MAJOR_VERSION=`echo ${_LD_FULL_VERSION} | $AWK -F\. '{ print $1 }'` + if test "$_LD_MAJOR_VERSION" != "$_CC_SUITE"; then + AC_MSG_ERROR([The linker major version, $_LD_FULL_VERSION, does not match the compiler suite version, $_CC_SUITE.]) + fi + ;; + esac INCREMENTAL_LINKER=1 diff --git a/old-configure.in b/old-configure.in index 404bf96ed720..24e33974ffd7 100644 --- a/old-configure.in +++ b/old-configure.in @@ -242,12 +242,18 @@ case "$target" in WIN32_REDIST_DIR=`cd "$WIN32_REDIST_DIR" && pwd -W` fi - # Check linker version - _LD_FULL_VERSION=`"${LINKER}" -v 2>&1 | sed -nre "$_MSVC_VER_FILTER"` - _LD_MAJOR_VERSION=`echo ${_LD_FULL_VERSION} | $AWK -F\. '{ print $1 }'` - if test "$_LD_MAJOR_VERSION" != "$_CC_SUITE"; then - AC_MSG_ERROR([The linker major version, $_LD_FULL_VERSION, does not match the compiler suite version, $_CC_SUITE.]) - fi + # Check linker version, except in lld builds + case "$LINKER" in + *lld*) + ;; + *) + _LD_FULL_VERSION=`"${LINKER}" -v 2>&1 | sed -nre "$_MSVC_VER_FILTER"` + _LD_MAJOR_VERSION=`echo ${_LD_FULL_VERSION} | $AWK -F\. '{ print $1 }'` + if test "$_LD_MAJOR_VERSION" != "$_CC_SUITE"; then + AC_MSG_ERROR([The linker major version, $_LD_FULL_VERSION, does not match the compiler suite version, $_CC_SUITE.]) + fi + ;; + esac INCREMENTAL_LINKER=1 From 45d67964d6b0f00265b70ea24130e596fcdae0c3 Mon Sep 17 00:00:00 2001 From: Dragana Damjanovic Date: Wed, 20 Dec 2017 16:45:30 +0100 Subject: [PATCH 19/32] Bug 1422895 - TFO should be possible only on Windows 10 Fall Creators Update or later. r=mcmanus --- netwerk/protocol/http/nsHttpHandler.cpp | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/netwerk/protocol/http/nsHttpHandler.cpp b/netwerk/protocol/http/nsHttpHandler.cpp index 7e40068cc3bd..a079088be296 100644 --- a/netwerk/protocol/http/nsHttpHandler.cpp +++ b/netwerk/protocol/http/nsHttpHandler.cpp @@ -78,6 +78,7 @@ #if defined(XP_WIN) #include +#include "mozilla/WindowsVersion.h" #endif #if defined(XP_MACOSX) @@ -308,6 +309,8 @@ nsHttpHandler::SetFastOpenOSSupport() mFastOpenSupported = false; #if !defined(XP_WIN) && !defined(XP_LINUX) && !defined(ANDROID) && !defined(HAS_CONNECTX) return; +#elif defined(XP_WIN) + mFastOpenSupported = IsWindows10BuildOrLater(16299); #else nsAutoCString version; @@ -332,9 +335,7 @@ nsHttpHandler::SetFastOpenOSSupport() if (NS_SUCCEEDED(rv)) { // set min version minus 1. -#ifdef XP_WIN - int min_version[] = {10, 0}; -#elif XP_MACOSX +#if XP_MACOSX int min_version[] = {15, 0}; #elif ANDROID int min_version[] = {4, 4}; @@ -366,16 +367,6 @@ nsHttpHandler::SetFastOpenOSSupport() } } #endif - -#ifdef XP_WIN - if (mFastOpenSupported) { - // We have some problems with lavasoft software and tcp fast open. - if (GetModuleHandleW(L"pmls64.dll") || GetModuleHandleW(L"rlls64.dll")) { - mFastOpenSupported = false; - } - } -#endif - LOG(("nsHttpHandler::SetFastOpenOSSupport %s supported.\n", mFastOpenSupported ? "" : "not")); } From aa417857ba78c126589dc2d32fad2ffd538e2726 Mon Sep 17 00:00:00 2001 From: Ben Kelly Date: Wed, 20 Dec 2017 10:53:18 -0500 Subject: [PATCH 20/32] Bug 1426253 P1 Expose nsIDocument GetClientInfo(), GetClientState(), and GetController(). r=asuth --- dom/base/nsDocument.cpp | 33 +++++++++++++++++++++++++++++++++ dom/base/nsIDocument.h | 7 +++++++ 2 files changed, 40 insertions(+) diff --git a/dom/base/nsDocument.cpp b/dom/base/nsDocument.cpp index db86c02c4118..658d65a91b44 100644 --- a/dom/base/nsDocument.cpp +++ b/dom/base/nsDocument.cpp @@ -212,6 +212,8 @@ #include "mozilla/dom/AnimatableBinding.h" #include "mozilla/dom/AnonymousContent.h" #include "mozilla/dom/BindingUtils.h" +#include "mozilla/dom/ClientInfo.h" +#include "mozilla/dom/ClientState.h" #include "mozilla/dom/DocumentFragment.h" #include "mozilla/dom/DocumentTimeline.h" #include "mozilla/dom/Event.h" @@ -225,6 +227,7 @@ #include "mozilla/dom/WebComponentsBinding.h" #include "mozilla/dom/CustomElementRegistryBinding.h" #include "mozilla/dom/CustomElementRegistry.h" +#include "mozilla/dom/ServiceWorkerDescriptor.h" #include "mozilla/dom/TimeoutManager.h" #include "mozilla/ExtensionPolicyService.h" #include "nsFrame.h" @@ -5842,6 +5845,36 @@ nsIDocument::GetAnonRootIfInAnonymousContentContainer(nsINode* aNode) const return nullptr; } +Maybe +nsIDocument::GetClientInfo() const +{ + nsPIDOMWindowInner* inner = GetInnerWindow(); + if (inner) { + return Move(inner->GetClientInfo()); + } + return Move(Maybe()); +} + +Maybe +nsIDocument::GetClientState() const +{ + nsPIDOMWindowInner* inner = GetInnerWindow(); + if (inner) { + return Move(inner->GetClientState()); + } + return Move(Maybe()); +} + +Maybe +nsIDocument::GetController() const +{ + nsPIDOMWindowInner* inner = GetInnerWindow(); + if (inner) { + return Move(inner->GetController()); + } + return Move(Maybe()); +} + // // nsIDOMDocument interface // diff --git a/dom/base/nsIDocument.h b/dom/base/nsIDocument.h index cc37f6b2de28..6d0ee95a69e5 100644 --- a/dom/base/nsIDocument.h +++ b/dom/base/nsIDocument.h @@ -128,6 +128,8 @@ class Animation; class AnonymousContent; class Attr; class BoxObject; +class ClientInfo; +class ClientState; class CDATASection; class Comment; struct CustomElementDefinition; @@ -159,6 +161,7 @@ class ProcessingInstruction; class Promise; class ScriptLoader; class Selection; +class ServiceWorkerDescriptor; class StyleSheetList; class SVGDocument; class SVGSVGElement; @@ -1124,6 +1127,10 @@ public: // Resolve all SVG pres attrs scheduled in ScheduleSVGForPresAttrEvaluation virtual void ResolveScheduledSVGPresAttrs() = 0; + mozilla::Maybe GetClientInfo() const; + mozilla::Maybe GetClientState() const; + mozilla::Maybe GetController() const; + protected: virtual Element *GetRootElementInternal() const = 0; From 7c2e00408ea158438deb08c6ff096c9aafb32ca5 Mon Sep 17 00:00:00 2001 From: Ben Kelly Date: Wed, 20 Dec 2017 10:53:18 -0500 Subject: [PATCH 21/32] Bug 1426253 P2 Use nsIDocument::GetClientInfo() where possible. r=asuth --- dom/clients/manager/ClientOpenWindowUtils.cpp | 11 +----- dom/workers/ServiceWorkerManager.cpp | 39 ++++++++----------- netwerk/base/LoadInfo.cpp | 6 +-- 3 files changed, 19 insertions(+), 37 deletions(-) diff --git a/dom/clients/manager/ClientOpenWindowUtils.cpp b/dom/clients/manager/ClientOpenWindowUtils.cpp index 6daadadd9d23..ad53772f9480 100644 --- a/dom/clients/manager/ClientOpenWindowUtils.cpp +++ b/dom/clients/manager/ClientOpenWindowUtils.cpp @@ -80,15 +80,8 @@ public: return NS_OK; } - nsPIDOMWindowInner* innerWindow = doc->GetInnerWindow(); - if (NS_WARN_IF(!innerWindow)) { - mPromise->Reject(NS_ERROR_FAILURE, __func__); - mPromise = nullptr; - return NS_OK; - } - - Maybe info = innerWindow->GetClientInfo(); - Maybe state = innerWindow->GetClientState(); + Maybe info(doc->GetClientInfo()); + Maybe state(doc->GetClientState()); if (NS_WARN_IF(info.isNothing() || state.isNothing())) { mPromise->Reject(NS_ERROR_FAILURE, __func__); diff --git a/dom/workers/ServiceWorkerManager.cpp b/dom/workers/ServiceWorkerManager.cpp index 4bf3ea719c5f..b5429afeee6f 100644 --- a/dom/workers/ServiceWorkerManager.cpp +++ b/dom/workers/ServiceWorkerManager.cpp @@ -2372,15 +2372,12 @@ ServiceWorkerManager::StartControllingADocument(ServiceWorkerRegistrationInfo* a // document here, our goal is to move ServiceWorkerManager to a separate // process. Using the ClientHandle supports this remote operation. ServiceWorkerInfo* activeWorker = aRegistration->GetActive(); - nsPIDOMWindowInner* innerWindow = aDoc->GetInnerWindow(); - if (activeWorker && innerWindow) { - Maybe clientInfo = innerWindow->GetClientInfo(); - if (clientInfo.isSome()) { - RefPtr clientHandle = - ClientManager::CreateHandle(clientInfo.ref(), - SystemGroup::EventTargetFor(TaskCategory::Other)); - ref = Move(clientHandle->Control(activeWorker->Descriptor())); - } + Maybe clientInfo = aDoc->GetClientInfo(); + if (activeWorker && clientInfo.isSome()) { + RefPtr clientHandle = + ClientManager::CreateHandle(clientInfo.ref(), + SystemGroup::EventTargetFor(TaskCategory::Other)); + ref = Move(clientHandle->Control(activeWorker->Descriptor())); } Telemetry::Accumulate(Telemetry::SERVICE_WORKER_CONTROLLED_DOCUMENTS, 1); @@ -3273,7 +3270,7 @@ ServiceWorkerManager::UpdateClientControllers(ServiceWorkerRegistrationInfo* aRe RefPtr activeWorker = aRegistration->GetActive(); MOZ_DIAGNOSTIC_ASSERT(activeWorker); - AutoTArray, 16> innerWindows; + AutoTArray, 16> docList; for (auto iter = mControlledDocuments.Iter(); !iter.Done(); iter.Next()) { if (iter.UserData() != aRegistration) { continue; @@ -3284,24 +3281,20 @@ ServiceWorkerManager::UpdateClientControllers(ServiceWorkerRegistrationInfo* aRe continue; } - nsPIDOMWindowInner* innerWindow = doc->GetInnerWindow(); - if (NS_WARN_IF(!innerWindow)) { - continue; - } - - innerWindows.AppendElement(innerWindow); + docList.AppendElement(doc.forget()); } // Fire event after iterating mControlledDocuments is done to prevent // modification by reentering from the event handlers during iteration. - for (auto& innerWindow : innerWindows) { - Maybe clientInfo = innerWindow->GetClientInfo(); - if (clientInfo.isSome()) { - RefPtr clientHandle = - ClientManager::CreateHandle(clientInfo.ref(), - innerWindow->EventTargetFor(TaskCategory::Other)); - clientHandle->Control(activeWorker->Descriptor()); + for (auto& doc : docList) { + Maybe clientInfo = doc->GetClientInfo(); + if (clientInfo.isNothing()) { + continue; } + RefPtr clientHandle = + ClientManager::CreateHandle(clientInfo.ref(), + SystemGroup::EventTargetFor(TaskCategory::Other)); + clientHandle->Control(activeWorker->Descriptor()); } } diff --git a/netwerk/base/LoadInfo.cpp b/netwerk/base/LoadInfo.cpp index 9ca75629ca1c..3bf17b4019ce 100644 --- a/netwerk/base/LoadInfo.cpp +++ b/netwerk/base/LoadInfo.cpp @@ -117,11 +117,7 @@ LoadInfo::LoadInfo(nsIPrincipal* aLoadingPrincipal, // Ensure that all network requests for a window client have the ClientInfo // properly set. // TODO: The ClientInfo is not set properly for worker initiated requests yet. - nsCOMPtr contextInner = - aLoadingContext->OwnerDoc()->GetInnerWindow(); - if (contextInner) { - mClientInfo = contextInner->GetClientInfo(); - } + mClientInfo = aLoadingContext->OwnerDoc()->GetClientInfo(); nsCOMPtr contextOuter = aLoadingContext->OwnerDoc()->GetWindow(); if (contextOuter) { From 0240c2751fe0bf6391adb4bd4d17a9d5783e8a73 Mon Sep 17 00:00:00 2001 From: Ben Kelly Date: Wed, 20 Dec 2017 10:53:18 -0500 Subject: [PATCH 22/32] Bug 1426253 P3 Use the window/document GetController() method. r=asuth --- docshell/base/nsDocShell.cpp | 2 +- dom/base/nsContentSink.cpp | 3 ++- dom/base/nsContentUtils.cpp | 24 +----------------------- dom/base/nsContentUtils.h | 5 ----- dom/base/nsDocument.cpp | 2 +- dom/workers/ServiceWorkerManager.cpp | 22 ---------------------- dom/workers/ServiceWorkerManager.h | 3 --- image/ImageCacheKey.cpp | 2 +- 8 files changed, 6 insertions(+), 57 deletions(-) diff --git a/docshell/base/nsDocShell.cpp b/docshell/base/nsDocShell.cpp index 7c7639d7e1c0..8aa387c4daf2 100644 --- a/docshell/base/nsDocShell.cpp +++ b/docshell/base/nsDocShell.cpp @@ -15222,7 +15222,7 @@ nsDocShell::ShouldPrepareForIntercept(nsIURI* aURI, bool aIsNonSubresourceReques } ErrorResult rv; - *aShouldIntercept = swm->IsControlled(doc, rv); + *aShouldIntercept = doc->GetController().isSome(); if (NS_WARN_IF(rv.Failed())) { return rv.StealNSResult(); } diff --git a/dom/base/nsContentSink.cpp b/dom/base/nsContentSink.cpp index 3ca1dbfb1afc..09223d69e593 100644 --- a/dom/base/nsContentSink.cpp +++ b/dom/base/nsContentSink.cpp @@ -48,6 +48,7 @@ #include "nsHTMLDNSPrefetch.h" #include "nsIObserverService.h" #include "mozilla/Preferences.h" +#include "mozilla/dom/ServiceWorkerDescriptor.h" #include "mozilla/dom/ScriptLoader.h" #include "nsParserConstants.h" #include "nsSandboxFlags.h" @@ -1109,7 +1110,7 @@ nsContentSink::ProcessOfflineManifest(const nsAString& aManifestSpec) // If this document has been interecepted, let's skip the processing of the // manifest. - if (nsContentUtils::IsControlledByServiceWorker(mDocument)) { + if (mDocument->GetController().isSome()) { return; } diff --git a/dom/base/nsContentUtils.cpp b/dom/base/nsContentUtils.cpp index 24ed3934c1f4..2caad39070df 100644 --- a/dom/base/nsContentUtils.cpp +++ b/dom/base/nsContentUtils.cpp @@ -1978,28 +1978,6 @@ nsContentUtils::ParseLegacyFontSize(const nsAString& aValue) return clamped(value, 1, 7); } -/* static */ -bool -nsContentUtils::IsControlledByServiceWorker(nsIDocument* aDocument) -{ - if (nsContentUtils::IsInPrivateBrowsing(aDocument)) { - return false; - } - - RefPtr swm = - workers::ServiceWorkerManager::GetInstance(); - MOZ_ASSERT(swm); - - ErrorResult rv; - bool controlled = swm->IsControlled(aDocument, rv); - if (NS_WARN_IF(rv.Failed())) { - rv.SuppressException(); - return false; - } - - return controlled; -} - /* static */ void nsContentUtils::GetOfflineAppManifest(nsIDocument *aDocument, nsIURI **aURI) @@ -2008,7 +1986,7 @@ nsContentUtils::GetOfflineAppManifest(nsIDocument *aDocument, nsIURI **aURI) MOZ_ASSERT(aDocument); *aURI = nullptr; - if (IsControlledByServiceWorker(aDocument)) { + if (aDocument->GetController().isSome()) { return; } diff --git a/dom/base/nsContentUtils.h b/dom/base/nsContentUtils.h index d17f312c23e4..aab64fe3df10 100644 --- a/dom/base/nsContentUtils.h +++ b/dom/base/nsContentUtils.h @@ -2396,11 +2396,6 @@ public: return sIsScopedStyleEnabled; } - /** - * Return true if this doc is controlled by a ServiceWorker. - */ - static bool IsControlledByServiceWorker(nsIDocument* aDocument); - /** * Fire mutation events for changes caused by parsing directly into a * context node. diff --git a/dom/base/nsDocument.cpp b/dom/base/nsDocument.cpp index 658d65a91b44..285a770ec999 100644 --- a/dom/base/nsDocument.cpp +++ b/dom/base/nsDocument.cpp @@ -5055,7 +5055,7 @@ nsDocument::SetScriptGlobalObject(nsIScriptGlobalObject *aScriptGlobalObject) RefPtr swm = ServiceWorkerManager::GetInstance(); if (swm) { ErrorResult error; - if (swm->IsControlled(this, error)) { + if (GetController().isSome()) { imgLoader* loader = nsContentUtils::GetImgLoaderForDocument(this); if (loader) { loader->ClearCacheForControlledDocument(this); diff --git a/dom/workers/ServiceWorkerManager.cpp b/dom/workers/ServiceWorkerManager.cpp index b5429afeee6f..565a92fb0311 100644 --- a/dom/workers/ServiceWorkerManager.cpp +++ b/dom/workers/ServiceWorkerManager.cpp @@ -2784,28 +2784,6 @@ ServiceWorkerManager::IsAvailable(nsIPrincipal* aPrincipal, return registration && registration->GetActive(); } -bool -ServiceWorkerManager::IsControlled(nsIDocument* aDoc, ErrorResult& aRv) -{ - MOZ_ASSERT(aDoc); - - if (nsContentUtils::IsInPrivateBrowsing(aDoc)) { - // Handle the case where a service worker was previously registered in - // a non-private window (bug 1255621). - return false; - } - - RefPtr registration; - nsresult rv = GetDocumentRegistration(aDoc, getter_AddRefs(registration)); - if (NS_WARN_IF(NS_FAILED(rv) && rv != NS_ERROR_NOT_AVAILABLE)) { - // It's OK to ignore the case where we don't have a registration. - aRv.Throw(rv); - return false; - } - - return !!registration; -} - nsresult ServiceWorkerManager::GetDocumentRegistration(nsIDocument* aDoc, ServiceWorkerRegistrationInfo** aRegistrationInfo) diff --git a/dom/workers/ServiceWorkerManager.h b/dom/workers/ServiceWorkerManager.h index 98f2cb31a5a4..a8d5fcbbd9e0 100644 --- a/dom/workers/ServiceWorkerManager.h +++ b/dom/workers/ServiceWorkerManager.h @@ -125,9 +125,6 @@ public: bool IsAvailable(nsIPrincipal* aPrincipal, nsIURI* aURI); - bool - IsControlled(nsIDocument* aDocument, ErrorResult& aRv); - // Return true if the given content process could potentially be executing // service worker code with the given principal. At the current time, this // just means that we have any registration for the origin, regardless of diff --git a/image/ImageCacheKey.cpp b/image/ImageCacheKey.cpp index 2dfdc7c763cc..988a9523b09f 100644 --- a/image/ImageCacheKey.cpp +++ b/image/ImageCacheKey.cpp @@ -168,7 +168,7 @@ ImageCacheKey::GetControlledDocumentToken(nsIDocument* aDocument) RefPtr swm = ServiceWorkerManager::GetInstance(); if (aDocument && swm) { ErrorResult rv; - if (swm->IsControlled(aDocument, rv)) { + if (aDocument->GetController().isSome()) { pointer = aDocument; } } From 0c4c26f91ff8a5f84e7efd5ce5f725224aea63ef Mon Sep 17 00:00:00 2001 From: Ben Kelly Date: Wed, 20 Dec 2017 10:53:19 -0500 Subject: [PATCH 23/32] Bug 1426253 P4 Assert that ClientSource::SetController() is never called on a client in private browsing mode. r=asuth --- dom/clients/manager/ClientInfo.cpp | 28 ++++++++++++++++++++++++++++ dom/clients/manager/ClientInfo.h | 4 ++++ dom/clients/manager/ClientSource.cpp | 5 +++++ 3 files changed, 37 insertions(+) diff --git a/dom/clients/manager/ClientInfo.cpp b/dom/clients/manager/ClientInfo.cpp index b335bd78cb9c..a74f73049203 100644 --- a/dom/clients/manager/ClientInfo.cpp +++ b/dom/clients/manager/ClientInfo.cpp @@ -11,6 +11,8 @@ namespace mozilla { namespace dom { +using mozilla::ipc::PrincipalInfo; + ClientInfo::ClientInfo(const nsID& aId, ClientType aType, const mozilla::ipc::PrincipalInfo& aPrincipalInfo, @@ -110,5 +112,31 @@ ClientInfo::ToIPC() const return *mData; } +bool +ClientInfo::IsPrivateBrowsing() const +{ + switch(PrincipalInfo().type()) { + case PrincipalInfo::TContentPrincipalInfo: + { + auto& p = PrincipalInfo().get_ContentPrincipalInfo(); + return p.attrs().mPrivateBrowsingId != 0; + } + case PrincipalInfo::TSystemPrincipalInfo: + { + return false; + } + case PrincipalInfo::TNullPrincipalInfo: + { + auto& p = PrincipalInfo().get_NullPrincipalInfo(); + return p.attrs().mPrivateBrowsingId != 0; + } + default: + { + // clients should never be expanded principals + MOZ_CRASH("unexpected principal type!"); + } + } +} + } // namespace dom } // namespace mozilla diff --git a/dom/clients/manager/ClientInfo.h b/dom/clients/manager/ClientInfo.h index 41e547b8d652..9c212013cc6a 100644 --- a/dom/clients/manager/ClientInfo.h +++ b/dom/clients/manager/ClientInfo.h @@ -91,6 +91,10 @@ public: // Convert to the ipdl generated type. const IPCClientInfo& ToIPC() const; + + // Determine if the client is in private browsing mode. + bool + IsPrivateBrowsing() const; }; } // namespace dom diff --git a/dom/clients/manager/ClientSource.cpp b/dom/clients/manager/ClientSource.cpp index 6893bcc465a4..2b0909972e83 100644 --- a/dom/clients/manager/ClientSource.cpp +++ b/dom/clients/manager/ClientSource.cpp @@ -355,6 +355,11 @@ ClientSource::SetController(const ServiceWorkerDescriptor& aServiceWorker) { NS_ASSERT_OWNINGTHREAD(ClientSource); + // A client in private browsing mode should never be controlled by + // a service worker. The principal origin attributes should guarantee + // this invariant. + MOZ_DIAGNOSTIC_ASSERT(!mClientInfo.IsPrivateBrowsing()); + if (mController.isSome() && mController.ref() == aServiceWorker) { return; } From d741a755f20a02694b1f729efcdd6c89b1fbff6d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20Qu=C3=A8ze?= Date: Wed, 20 Dec 2017 16:56:33 +0100 Subject: [PATCH 24/32] Bug 1414126 - disable browser_urlbar_search_reflows.js on Linux debug and Windows debug due to intermittent timeouts, r=mconley. --- browser/base/content/test/performance/browser.ini | 1 + 1 file changed, 1 insertion(+) diff --git a/browser/base/content/test/performance/browser.ini b/browser/base/content/test/performance/browser.ini index 63a8184b6b83..aa253e59d3c9 100644 --- a/browser/base/content/test/performance/browser.ini +++ b/browser/base/content/test/performance/browser.ini @@ -28,6 +28,7 @@ skip-if = !e10s [browser_urlbar_keyed_search_reflows.js] skip-if = (os == 'linux') || (os == 'win' && debug) # Disabled on Linux and Windows debug due to perma failures. Bug 1392320. [browser_urlbar_search_reflows.js] +skip-if = debug && (os == 'linux' || os == 'win') # Disabled on Linux and Windows debug due to intermittent timeouts. Bug 1414126. [browser_windowclose_reflows.js] [browser_windowopen_flicker.js] skip-if = (debug && os == 'win') # Disabled on windows debug for intermittent leaks From bf955aea0bc09373e11791a32e4bd6e565e6af71 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20Qu=C3=A8ze?= Date: Wed, 20 Dec 2017 16:56:36 +0100 Subject: [PATCH 25/32] Bug 1421460 - restore icon should be visible at first paint, r=johannh. --- browser/base/content/browser.js | 40 +++++++++---------- .../performance/browser_startup_flicker.js | 7 ---- 2 files changed, 19 insertions(+), 28 deletions(-) diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js index 6cc530bb0fa4..71d35c76563e 100755 --- a/browser/base/content/browser.js +++ b/browser/base/content/browser.js @@ -1213,6 +1213,25 @@ var gBrowserInit = { initBrowser.removeAttribute("blank"); } + // Set a sane starting width/height for all resolutions on new profiles. + if (Services.prefs.getBoolPref("privacy.resistFingerprinting")) { + // When the fingerprinting resistance is enabled, making sure that we don't + // have a maximum window to interfere with generating rounded window dimensions. + document.documentElement.setAttribute("sizemode", "normal"); + } else if (!document.documentElement.hasAttribute("width")) { + const TARGET_WIDTH = 1280; + const TARGET_HEIGHT = 1040; + let width = Math.min(screen.availWidth * .9, TARGET_WIDTH); + let height = Math.min(screen.availHeight * .9, TARGET_HEIGHT); + + document.documentElement.setAttribute("width", width); + document.documentElement.setAttribute("height", height); + + if (width < TARGET_WIDTH && height < TARGET_HEIGHT) { + document.documentElement.setAttribute("sizemode", "maximized"); + } + } + gBrowser.updateBrowserRemoteness(initBrowser, isRemote, { remoteType, sameProcessAsFrameLoader }); @@ -1275,27 +1294,6 @@ var gBrowserInit = { gDragSpaceObserver.init(); } - let isResistFingerprintingEnabled = Services.prefs.getBoolPref("privacy.resistFingerprinting"); - - // Set a sane starting width/height for all resolutions on new profiles. - if (isResistFingerprintingEnabled) { - // When the fingerprinting resistance is enabled, making sure that we don't - // have a maximum window to interfere with generating rounded window dimensions. - document.documentElement.setAttribute("sizemode", "normal"); - } else if (!document.documentElement.hasAttribute("width")) { - const TARGET_WIDTH = 1280; - const TARGET_HEIGHT = 1040; - let width = Math.min(screen.availWidth * .9, TARGET_WIDTH); - let height = Math.min(screen.availHeight * .9, TARGET_HEIGHT); - - document.documentElement.setAttribute("width", width); - document.documentElement.setAttribute("height", height); - - if (width < TARGET_WIDTH && height < TARGET_HEIGHT) { - document.documentElement.setAttribute("sizemode", "maximized"); - } - } - if (!window.toolbar.visible) { // adjust browser UI for popups gURLBar.setAttribute("readonly", "true"); diff --git a/browser/base/content/test/performance/browser_startup_flicker.js b/browser/base/content/test/performance/browser_startup_flicker.js index 955dd88a200a..ea1c2b763521 100644 --- a/browser/base/content/test/performance/browser_startup_flicker.js +++ b/browser/base/content/test/performance/browser_startup_flicker.js @@ -55,13 +55,6 @@ add_task(async function() { // starting at 15 to 25% of the window width inRange(r.x1, width * .15, width * .25) }, - - {name: "bug 1421460 - restore icon should be visible at first paint", - condition: r => r.w == 9 && r.h == 9 && // 9x9 icon - AppConstants.platform == "win" && - // near the right end of the screen - inRange(r.x1, width - 80, width - 70) - }, ]; let rectText = `${rect.toSource()}, window width: ${width}`; From 3bb09b84cc598c2367b32c88a68e2e2f333921d6 Mon Sep 17 00:00:00 2001 From: Jon Coppeard Date: Wed, 20 Dec 2017 16:08:55 +0000 Subject: [PATCH 26/32] Bug 1426387 - Remove unnecessary WPT ini file execorder.html.ini r=jgraham --- .../module/execorder.html.ini | 28 ------------------- 1 file changed, 28 deletions(-) delete mode 100644 testing/web-platform/meta/html/semantics/scripting-1/the-script-element/module/execorder.html.ini diff --git a/testing/web-platform/meta/html/semantics/scripting-1/the-script-element/module/execorder.html.ini b/testing/web-platform/meta/html/semantics/scripting-1/the-script-element/module/execorder.html.ini deleted file mode 100644 index fbc63a1a7a75..000000000000 --- a/testing/web-platform/meta/html/semantics/scripting-1/the-script-element/module/execorder.html.ini +++ /dev/null @@ -1,28 +0,0 @@ -[execorder.html] - type: testharness - expected: - if not debug and not e10s and (os == "mac") and (version == "OS X 10.10.5"): OK - [Unordered module script execution (parsed, unordered #1)] - expected: - if not debug and not e10s and (os == "mac") and (version == "OS X 10.10.5"): PASS - - [Unordered module script execution (parsed, unordered #2)] - expected: - if not debug and not e10s and (os == "mac") and (version == "OS X 10.10.5"): PASS - - [Unordered module script execution (dynamic, unordered #1)] - expected: - if not debug and not e10s and (os == "mac") and (version == "OS X 10.10.5"): PASS - - [Unordered module script execution (dynamic, unordered #2)] - expected: - if not debug and not e10s and (os == "mac") and (version == "OS X 10.10.5"): PASS - - [Interlaced module/non-module script execution (parsed, async-ordered)] - expected: - if not debug and not e10s and (os == "mac") and (version == "OS X 10.10.5"): PASS - - [Interlaced module/non-module script execution (dynamic, async-ordered)] - expected: - if not debug and not e10s and (os == "mac") and (version == "OS X 10.10.5"): PASS - From 98541cb1345deb03ae1fb25b76327032a0bad2cb Mon Sep 17 00:00:00 2001 From: Geoff Brown Date: Wed, 20 Dec 2017 09:37:27 -0700 Subject: [PATCH 27/32] Bug 1383061 - Really disable wpt css/css-backgrounds/border-image-slice-001.xht on linux/debug; r=me, a=test-only The previous attempt to disable this test was ineffective. --- .../meta/css/css-backgrounds/border-image-slice-001.xht.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testing/web-platform/meta/css/css-backgrounds/border-image-slice-001.xht.ini b/testing/web-platform/meta/css/css-backgrounds/border-image-slice-001.xht.ini index 59c40f1f66b6..6ccbe1a2943e 100644 --- a/testing/web-platform/meta/css/css-backgrounds/border-image-slice-001.xht.ini +++ b/testing/web-platform/meta/css/css-backgrounds/border-image-slice-001.xht.ini @@ -1,3 +1,3 @@ -[border-image-slice-percentage.html] +[border-image-slice-001.xht] type: reftest disabled: if (os == "linux") and debug: https://bugzilla.mozilla.org/show_bug.cgi?id=1383061 From 52370a906b00ccba0a0e12e99c915898157c15c3 Mon Sep 17 00:00:00 2001 From: Jim Chen Date: Wed, 20 Dec 2017 12:14:01 -0500 Subject: [PATCH 28/32] Bug 1425262 - 3. Follow-up to fix wrong comment; r=me Fix comment referencing support for transformation matrix. --- .../src/main/java/org/mozilla/gecko/gfx/GeckoDisplay.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/mobile/android/geckoview/src/main/java/org/mozilla/gecko/gfx/GeckoDisplay.java b/mobile/android/geckoview/src/main/java/org/mozilla/gecko/gfx/GeckoDisplay.java index 19d4cc2568d5..6eaa793539f2 100644 --- a/mobile/android/geckoview/src/main/java/org/mozilla/gecko/gfx/GeckoDisplay.java +++ b/mobile/android/geckoview/src/main/java/org/mozilla/gecko/gfx/GeckoDisplay.java @@ -45,12 +45,10 @@ public class GeckoDisplay { /** * Optional callback. The display's coordinates on the screen has changed. Must be - * called on the application main thread. Together with the transformation matrix, the - * screen origin determines how a point on the display maps to a point on the screen. + * called on the application main thread. * * @param left The X coordinate of the display on the screen, in screen pixels. * @param top The Y coordinate of the display on the screen, in screen pixels. - * @see #transformationMatrixChanged(Matrix) */ public void screenOriginChanged(final int left, final int top) { mSession.onScreenOriginChanged(left, top); From 1a5cf5873befd7ac0ef2f8ab3c33f99f3b253dfe Mon Sep 17 00:00:00 2001 From: Steve Fink Date: Tue, 19 Dec 2017 15:36:17 -0800 Subject: [PATCH 29/32] Bug 1410528 - Define MOZ_CRASHREPORTER and MOZ_AUTOMATION_BUILD_SYMBOLS for recurse_syms, r=glandium --HG-- extra : rebase_source : fbb7948d135e56b82777124a3afc6b2003ac212a extra : histedit_source : 99c878b29234e684e2776a15c10b0c9cc0cd815c --- browser/config/tooltool-manifests/linux64/jsshell.manifest | 4 ++-- js/src/devtools/automation/README | 6 ++++-- js/src/devtools/automation/autospider.py | 7 +++++-- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/browser/config/tooltool-manifests/linux64/jsshell.manifest b/browser/config/tooltool-manifests/linux64/jsshell.manifest index 953f68c77c7a..7c006a04251f 100644 --- a/browser/config/tooltool-manifests/linux64/jsshell.manifest +++ b/browser/config/tooltool-manifests/linux64/jsshell.manifest @@ -1,7 +1,7 @@ [ { - "size": 996696, - "digest": "7c09f6144c84a6dd9bdb8d817e7957b432e72138ecb4a2adf6f5754b7ef2a2bd5c53ba113659283644f510a1aab87a1efc09851bc07457978eb0c0a63f4c29a4", + "size": 2156788, + "digest": "8e3b50c4879f1321655a7b2b613dc6c981580fb5e14af585eda1f79020e98378f67bfdf46bf49c060635b283b1892d0e5ca23ab219af83de0456fbee3e276983", "algorithm": "sha512", "filename": "breakpad-tools.tar.xz", "unpack": true diff --git a/js/src/devtools/automation/README b/js/src/devtools/automation/README index c3038218f964..70f56fd230c4 100644 --- a/js/src/devtools/automation/README +++ b/js/src/devtools/automation/README @@ -23,14 +23,16 @@ available on linux64, and is built via the following procedure: % export PATH=$PATH:$(pwd)/depot_tools % mkdir breakpad % cd breakpad + # python must be python2.7 % fetch breakpad % cd src % git fetch https://github.com/hotsphink/breakpad injector - % git checkout injector + % git checkout FETCH_HEAD % cd .. % mkdir obj % cd obj - % ../src/configure + # Possibly set $PATH to include a recent gcc + % ../src/configure --enable-static % mkdir ../root % make install DESTDIR=$(pwd)/../root diff --git a/js/src/devtools/automation/autospider.py b/js/src/devtools/automation/autospider.py index 9b979ed5b11f..6b5d62185531 100755 --- a/js/src/devtools/automation/autospider.py +++ b/js/src/devtools/automation/autospider.py @@ -367,14 +367,17 @@ if not args.nobuild: if use_minidump: # Convert symbols to breakpad format. hostdir = os.path.join(OBJDIR, "dist", "host", "bin") - os.makedirs(hostdir) + if not os.path.isdir(hostdir): + os.makedirs(hostdir) shutil.copy(os.path.join(DIR.tooltool, "breakpad-tools", "dump_syms"), os.path.join(hostdir, 'dump_syms')) run_command([ 'make', 'recurse_syms', 'MOZ_SOURCE_REPO=file://' + DIR.source, - 'RUST_TARGET=0', 'RUSTC_COMMIT=0' + 'RUST_TARGET=0', 'RUSTC_COMMIT=0', + 'MOZ_CRASHREPORTER=1', + 'MOZ_AUTOMATION_BUILD_SYMBOLS=1', ], check=True) COMMAND_PREFIX = [] From 02a910737b4390d97d66640f392858d52131d6f2 Mon Sep 17 00:00:00 2001 From: Steve Fink Date: Mon, 20 Nov 2017 16:10:01 -0800 Subject: [PATCH 30/32] Bug 1426439 - Allow stack reporting for timed out tests, r=jonco --HG-- extra : rebase_source : c8685a61852c64697f46299c5dd2e33d8682fab2 extra : histedit_source : 596be6d6af6058b78f90115a03e7407c85c2391f --- js/src/tests/lib/tasks_unix.py | 30 +++++++++++++++++++----------- 1 file changed, 19 insertions(+), 11 deletions(-) diff --git a/js/src/tests/lib/tasks_unix.py b/js/src/tests/lib/tasks_unix.py index 6550335222f0..dbef0112a4a1 100644 --- a/js/src/tests/lib/tasks_unix.py +++ b/js/src/tests/lib/tasks_unix.py @@ -2,7 +2,7 @@ # waitpid to dispatch tasks. This avoids several deadlocks that are possible # with fork/exec + threads + Python. -import errno, os, select, sys +import errno, os, select, signal, sys from datetime import datetime, timedelta from progressbar import ProgressBar from results import NullTestOutput, TestOutput, escape_cmdline @@ -131,14 +131,16 @@ def remove_task(tasks, pid): def timed_out(task, timeout): """ - Return True if the given task has been running for longer than |timeout|. - |timeout| may be falsy, indicating an infinite timeout (in which case - timed_out always returns False). + Return a timedelta with the amount we are overdue, or False if the timeout + has not yet been reached (or timeout is falsy, indicating there is no + timeout.) """ - if timeout: - now = datetime.now() - return (now - task.start) > timedelta(seconds=timeout) - return False + if not timeout: + return False + + elapsed = datetime.now() - task.start + over = elapsed - timedelta(seconds=timeout) + return over if over.total_seconds() > 0 else False def reap_zombies(tasks, timeout): """ @@ -181,11 +183,17 @@ def reap_zombies(tasks, timeout): def kill_undead(tasks, timeout): """ - Signal all children that are over the given timeout. + Signal all children that are over the given timeout. Use SIGABRT first to + generate a stack dump. If it still doesn't die for another 30 seconds, kill + with SIGKILL. """ for task in tasks: - if timed_out(task, timeout): - os.kill(task.pid, 9) + over = timed_out(task, timeout) + if over: + if over.total_seconds() < 30: + os.kill(task.pid, signal.SIGABRT) + else: + os.kill(task.pid, signal.SIGKILL) def run_all_tests(tests, prefix, pb, options): # Copy and reverse for fast pop off end. From e95c193a16f663b6194bfa056402fc0af1bcc31b Mon Sep 17 00:00:00 2001 From: ffxbld Date: Wed, 20 Dec 2017 10:37:28 -0800 Subject: [PATCH 31/32] No bug, Automated HSTS preload list update from host bld-linux64-spot-302 - a=hsts-update --- security/manager/ssl/nsSTSPreloadList.errors | 217 ++++++++++--------- security/manager/ssl/nsSTSPreloadList.inc | 63 +++--- 2 files changed, 151 insertions(+), 129 deletions(-) diff --git a/security/manager/ssl/nsSTSPreloadList.errors b/security/manager/ssl/nsSTSPreloadList.errors index 4effa538f9be..da81fb55e76b 100644 --- a/security/manager/ssl/nsSTSPreloadList.errors +++ b/security/manager/ssl/nsSTSPreloadList.errors @@ -39,10 +39,12 @@ achterhoekseveiligheidsbeurs.nl: could not connect to host acrossgw.com: could not connect to host ad-disruptio.fr: could not connect to host adamdixon.co.uk: could not connect to host +adventureally.com: could not connect to host aevpn.org: could not connect to host affily.io: could not connect to host aim-consultants.com: could not connect to host ajdiaz.me: could not connect to host +ajetaci.cz: could not connect to host akiba-server.info: could not connect to host akita-stream.com: could not connect to host akoww.de: could not connect to host @@ -57,10 +59,8 @@ alexey-shamara.ru: could not connect to host alexhaydock.co.uk: could not connect to host alexmol.tk: could not connect to host alexperry.io: could not connect to host -algebraaec.com: could not connect to host alilialili.ga: could not connect to host alldm.ru: could not connect to host -alltubedownload.net: could not connect to host altahrim.net: could not connect to host amdouglas.uk: could not connect to host ameho.me: could not connect to host @@ -110,6 +110,7 @@ authland.com: could not connect to host authsrv.nl.eu.org: could not connect to host autostop-occasions.be: could not connect to host avdelivers.com: could not connect to host +avi9526.pp.ua: could not connect to host avonlearningcampus.com: could not connect to host awan.tech: could not connect to host awf0.xyz: could not connect to host @@ -127,8 +128,8 @@ baobeiglass.com: could not connect to host barbate.fr: could not connect to host barracuda.blog: could not connect to host barreaudenice.com: could not connect to host -bbb1991.me: could not connect to host bbdos.ru: could not connect to host +bcradio.org: could not connect to host bdvg.org: could not connect to host bearden.io: could not connect to host beasel.biz: could not connect to host @@ -144,7 +145,9 @@ bey.io: could not connect to host bfrailwayclub.cf: could not connect to host bie.edu: [Exception... "Component returned failure code: 0x80004005 (NS_ERROR_FAILURE) [nsISiteSecurityService.processHeader]" nsresult: "0x80004005 (NS_ERROR_FAILURE)" location: "JS frame :: /builds/slave/m-cen-l64-periodicupdate-00000/getHSTSPreloadList.js :: processStsHeader :: line 119" data: no] bigerbio.com: could not connect to host +bilimoe.com: could not connect to host binam.center: could not connect to host +binaryabstraction.com: could not connect to host bingcheung.com: could not connect to host binimo.com: could not connect to host bip.gov.sa: could not connect to host @@ -157,7 +160,6 @@ bjgongyi.com: could not connect to host bjtxl.cn: could not connect to host blackdiam.net: could not connect to host blackscytheconsulting.com: could not connect to host -blameomar.com: could not connect to host blinkenlight.co.uk: could not connect to host blinkenlight.com.au: could not connect to host blog.gparent.org: could not connect to host @@ -194,6 +196,7 @@ businessmodeler.se: could not connect to host buyshoe.org: could not connect to host bvexplained.co.uk: could not connect to host by1898.com: could not connect to host +bynet.cz: could not connect to host bypass.kr: could not connect to host caipai.fm: could not connect to host calculatoaresecondhand.xyz: could not connect to host @@ -205,18 +208,23 @@ cardloan-manual.net: could not connect to host carloshmm.stream: could not connect to host casinoreal.com: could not connect to host caughtredhanded.co.nz: could not connect to host +cbdev.de: could not connect to host cctld.com: could not connect to host cee.io: could not connect to host cegfw.com: could not connect to host +ceml.ch: could not connect to host cencalvia.org: could not connect to host centos.pub: could not connect to host +cfneia.org: could not connect to host cgtx.us: could not connect to host challengeskins.com: could not connect to host championnat-romand-cuisiniers-amateurs.ch: could not connect to host chaouby.com: could not connect to host +charlenevondell.com: could not connect to host charonsecurity.com: could not connect to host cheatturnitin.com: could not connect to host cheesefusion.com: could not connect to host +cheltik.ru: could not connect to host childrendeservebetter.org: could not connect to host china-line.org: could not connect to host chinternet.xyz: could not connect to host @@ -225,16 +233,18 @@ christianhoffmann.info: could not connect to host christophersole.com: could not connect to host chromaryu.net: could not connect to host chziyue.com: could not connect to host +cienbeaute-lidl.fr: could not connect to host cinemysticism.com: could not connect to host cipher.land: could not connect to host +cirrohost.com: could not connect to host cjtkfan.club: could not connect to host clearchatsandbox.com: could not connect to host clearviewwealthprojector.com.au: could not connect to host -cloudbleed.info: could not connect to host cloudimproved.com: could not connect to host cloudimprovedtest.com: could not connect to host clownish.co.il: could not connect to host clycat.ru: could not connect to host +cmlignon.ch: could not connect to host cnlic.com: could not connect to host cnwage.com: could not connect to host co-yutaka.com: could not connect to host @@ -243,6 +253,8 @@ coco-cool.fr: could not connect to host codenlife.xyz: could not connect to host codercross.com: could not connect to host codercy.com: could not connect to host +codetripping.net: could not connect to host +cogumelosmagicos.org: could not connect to host coldfff.com: could not connect to host colleencornez.com: could not connect to host complt.xyz: could not connect to host @@ -263,6 +275,7 @@ cpaneltips.com: could not connect to host crackpfer.de: could not connect to host creative-wave.fr: could not connect to host creativecommonscatpictures.com: could not connect to host +creep.im: could not connect to host cristianhares.com: could not connect to host criticalaim.com: could not connect to host crox.co: could not connect to host @@ -282,9 +295,9 @@ dahlberg.cologne: could not connect to host daltonedwards.me: could not connect to host dam74.com.ar: could not connect to host daniel-stahl.net: could not connect to host +darinkotter.com: could not connect to host darkdestiny.ch: could not connect to host darlo.co.uk: could not connect to host -dart-tanke.com: could not connect to host data-detox.com: could not connect to host datascience.cafe: could not connect to host datorb.com: could not connect to host @@ -292,6 +305,7 @@ davidscherzer.at: could not connect to host davidstuff.net: could not connect to host davros.eu: could not connect to host davros.ru: could not connect to host +dawnson.is: could not connect to host day.vip: could not connect to host days.one: could not connect to host dbcom.ru: could not connect to host @@ -314,12 +328,14 @@ dev-talk.eu: could not connect to host devafterdark.com: could not connect to host devkid.net: could not connect to host devops.moe: could not connect to host -dgportals.co.uk: could not connect to host dhl-smart.ch: could not connect to host dhub.xyz: could not connect to host diceduels.com: could not connect to host dicgaming.net: could not connect to host dick.red: could not connect to host +die-borts.ch: could not connect to host +diemogebhardt.com: could not connect to host +dieser.me: could not connect to host digioccumss.ddns.net: could not connect to host diguass.us: could not connect to host dijks.com: could not connect to host @@ -329,6 +345,7 @@ disadattamentolavorativo.it: could not connect to host disco-crazy-world.de: could not connect to host distinctivephotography.com.au: could not connect to host ditch.ch: could not connect to host +dkn.go.id: could not connect to host dlyl888.com: could not connect to host dnsbird.org: could not connect to host dojifish.space: could not connect to host @@ -352,21 +369,22 @@ duelsow.eu: could not connect to host duks.com.br: could not connect to host duo.money: could not connect to host durangoenergyllc.com: could not connect to host -dworzak.ch: could not connect to host +dyn.im: could not connect to host e-mak.eu: could not connect to host e-wishlist.net: could not connect to host +ead-italia.it: could not connect to host eatfitoutlet.com.br: could not connect to host eatry.io: could not connect to host ectora.com: could not connect to host -edp-collaborative.com: could not connect to host eductf.org: could not connect to host eeb98.com: could not connect to host ehuber.info: could not connect to host einsatzstiefel.info: could not connect to host -element-43.com: could not connect to host +ejgconsultancy.co.uk: could not connect to host +eldisagjapi.com: could not connect to host elementarywave.com: could not connect to host elenorsmadness.org: could not connect to host -elia.cloud: could not connect to host +elguadia.faith: could not connect to host elisabeth-strunz.de: could not connect to host elonbase.com: could not connect to host elsword.moe: could not connect to host @@ -376,13 +394,12 @@ erkaelderbarenaaben.dk: could not connect to host erspro.net: could not connect to host estoic.net: could not connect to host ethiobaba.com: could not connect to host -etincelle.ml: could not connect to host euexia.fr: could not connect to host eurostrategy.vn.ua: could not connect to host ev-zertifikate.de: could not connect to host eveshaiwu.com: could not connect to host expxkcd.com: could not connect to host -extreme-players.com: could not connect to host +extensiblewebreportcard.org: could not connect to host eytosh.net: could not connect to host f00.fr: could not connect to host f8842.com: could not connect to host @@ -430,9 +447,11 @@ fragnic.com: could not connect to host franckyz.com: could not connect to host fransallen.com: could not connect to host franzt.ovh: could not connect to host +freddythechick.uk: could not connect to host fredliang.cn: could not connect to host fredtec.ru: could not connect to host freelansir.com: could not connect to host +freesounding.com: could not connect to host freshcode.nl: could not connect to host frickenate.com: could not connect to host frodriguez.xyz: could not connect to host @@ -491,14 +510,15 @@ getgeek.nu: could not connect to host getgeek.pl: could not connect to host getwarden.net: could not connect to host gevaulug.fr: could not connect to host +gfhgiro.nl: could not connect to host gfoss.gr: could not connect to host gfournier.ca: could not connect to host gglks.com: could not connect to host ggrks-asano.com: could not connect to host ggss.cf: could not connect to host gifzilla.net: could not connect to host -gilroywestwood.org: could not connect to host gina-architektur.design: could not connect to host +git.co: could not connect to host glasner.photo: could not connect to host glutenfreelife.co.nz: could not connect to host gmantra.org: could not connect to host @@ -514,6 +534,7 @@ gottfridsberg.org: could not connect to host goukon.ru: could not connect to host gozadentro.com: could not connect to host gozel.com.tr: could not connect to host +gpfclan.de: could not connect to host gradsm-ci.net: could not connect to host granth.io: could not connect to host gratisonlinesex.com: could not connect to host @@ -532,18 +553,18 @@ haktec.de: could not connect to host halcyonsbastion.com: could not connect to host hang333.pw: could not connect to host hapijs.cn: could not connect to host -happyagain.se: could not connect to host +hardfalcon.net: could not connect to host +harmfarm.nl: could not connect to host harrypottereditor.net: could not connect to host hasabig.wang: could not connect to host hasalittle.wang: could not connect to host hashplex.com: could not connect to host -haucke.xyz: could not connect to host haze.network: could not connect to host hbbet.com: could not connect to host hbvip.com: could not connect to host hdy.nz: could not connect to host -heap.zone: could not connect to host hearty.ink: could not connect to host +hebergeurssd.com: could not connect to host heisenberg.co: could not connect to host hejsupport.se: could not connect to host hellofilters.com: could not connect to host @@ -576,10 +597,10 @@ horvathd.eu: could not connect to host hostworkz.com: could not connect to host hozinga.de: could not connect to host hr98.tk: could not connect to host +hserver.top: could not connect to host huchet.me: could not connect to host hudingyuan.cn: could not connect to host huiser.nl: could not connect to host -hundter.com: could not connect to host huwjones.me: could not connect to host hydrante.ch: could not connect to host hypotheques24.ch: could not connect to host @@ -618,7 +639,6 @@ interviewpipeline.co.uk: could not connect to host investorloanshub.com: could not connect to host ip.or.at: could not connect to host iphonechina.net: could not connect to host -irenekauer.com: could not connect to host irinkeby.nu: could not connect to host isamiok.com: could not connect to host itad.top: could not connect to host @@ -630,7 +650,7 @@ ivfausland.de: could not connect to host j0ng.xyz: could not connect to host jaaxypro.com: could not connect to host jakincode.army: could not connect to host -jan-cermak.cz: could not connect to host +janssen.fm: could not connect to host japan4you.org: could not connect to host jaredfraser.com: could not connect to host javascriptlab.fr: could not connect to host @@ -641,11 +661,9 @@ jeffersonregan.org: could not connect to host jens.hk: could not connect to host jhburton.co.uk: could not connect to host jiaqiang.vip: could not connect to host -jichi.io: could not connect to host jie.dance: could not connect to host jjvanoorschot.nl: could not connect to host jkirsche.com: could not connect to host -jmk.hu: could not connect to host jmoreau.ddns.net: could not connect to host jobmedic.com: could not connect to host joecod.es: could not connect to host @@ -654,7 +672,6 @@ johngo.tk: could not connect to host jonathansanchez.pro: could not connect to host jonpads.com: could not connect to host jons.org: could not connect to host -js88.sg: could not connect to host jsc7776.com: could not connect to host jsjyhzy.cc: could not connect to host juliaoantiguidades.com.br: could not connect to host @@ -667,20 +684,22 @@ justmy.website: could not connect to host justzz.xyz: could not connect to host juventusmania1897.com: could not connect to host juzgalo.com: could not connect to host -kabus.org: could not connect to host +kaibol.com: could not connect to host kaika-facilitymanagement.de: could not connect to host kamitech.ch: could not connect to host +kanaanonline.org: could not connect to host kapo.info: could not connect to host karamna.com: could not connect to host karanlyons.com: could not connect to host karuneshjohri.com: could not connect to host -kashmirobserver.net: could not connect to host katzen.me: could not connect to host kawaiiku.com: could not connect to host kawaiiku.de: could not connect to host +kelm.me: could not connect to host kenvix.com: could not connect to host kerp.se: could not connect to host kevindekoninck.com: could not connect to host +kgb.us: could not connect to host kidbacker.com: could not connect to host kiedys.net: could not connect to host kieranweightman.me: could not connect to host @@ -716,7 +735,6 @@ laboutiquemarocaineduconvoyeur.com: could not connect to host laboutiquemarocaineduconvoyeur.ma: could not connect to host lacasa.fr: could not connect to host lacasseroy.com: could not connect to host -lacigf.org: could not connect to host ladylikeit.com: could not connect to host lafr4nc3.xyz: could not connect to host lanonfire.com: could not connect to host @@ -751,6 +769,7 @@ lhsj68.com: could not connect to host lhsj78.com: could not connect to host libertas-tech.com: could not connect to host likenosis.com: could not connect to host +lingerielovers.com.br: could not connect to host linkages.org: could not connect to host linksanitizer.com: could not connect to host linksextremist.at: could not connect to host @@ -766,10 +785,8 @@ lobosdomain.no-ip.info: could not connect to host locker3.com: could not connect to host logcat.info: could not connect to host logic8.ml: could not connect to host -logicchen.com: could not connect to host logimagine.com: could not connect to host lolhax.org: could not connect to host -lolicon.eu: could not connect to host loothole.com: could not connect to host losebellyfat.pro: could not connect to host loveandloyalty.se: could not connect to host @@ -779,7 +796,6 @@ ltransferts.com: could not connect to host lubot.net: could not connect to host lukasunger.cz: could not connect to host lukasunger.net: could not connect to host -lunasqu.ee: could not connect to host luom.net: could not connect to host luxonetwork.com: could not connect to host m4g.ru: could not connect to host @@ -788,6 +804,7 @@ magnacumlaude.co: could not connect to host mailon.ga: could not connect to host malesbdsm.com: could not connect to host malgraph.net: could not connect to host +maosi.xin: could not connect to host marcelmarnitz.com: could not connect to host mare92.cz: could not connect to host mariehane.com: could not connect to host @@ -814,11 +831,10 @@ meathealth.com: could not connect to host mecanicadom.com: could not connect to host mediadandy.com: could not connect to host medy-me.com: could not connect to host +melaniebilodeau.com: could not connect to host melhorproduto.com.br: could not connect to host melonstudios.net: could not connect to host -meltzow.net: could not connect to host melvinlow.com: could not connect to host -menaraannonces.com: could not connect to host menchez.me: could not connect to host mentax.net: could not connect to host menzaijia.com: could not connect to host @@ -835,9 +851,9 @@ minitruckin.net: could not connect to host miyugirls.com: could not connect to host mkfs.fr: could not connect to host modded-minecraft-server-list.com: could not connect to host +moderntld.net: could not connect to host moe-max.jp: could not connect to host monitori.ng: could not connect to host -moobo.xyz: could not connect to host mooselook.de: could not connect to host moparcraft.com: could not connect to host moparcraft.org: could not connect to host @@ -859,12 +875,14 @@ munduch.cz: could not connect to host muslimbanter.co.za: could not connect to host mybeautyjobs.de: could not connect to host mycustomwriting.com: could not connect to host +myeffect.today: could not connect to host myfappening.org: could not connect to host mygreatjobs.de: could not connect to host mynewleaf.co: could not connect to host mytravelblog.de: could not connect to host mzlog.win: could not connect to host naano.org: could not connect to host +nanogi.ga: could not connect to host naphex.rocks: could not connect to host narodsovety.ru: could not connect to host nassi.me: could not connect to host @@ -875,16 +893,16 @@ ncdesigns-studio.com: could not connect to host neartothesky.com: could not connect to host nedcf.org.uk: could not connect to host neer.io: could not connect to host -neio.uk: could not connect to host +negativecurvature.net: could not connect to host nekoku.io: could not connect to host nephy.jp: could not connect to host -netmeister.org: could not connect to host nevadafiber.net: could not connect to host newcityinfo.info: could not connect to host nexgeneration-solutions.com: could not connect to host nexusbyte.de: could not connect to host nexuscorporation.in: could not connect to host nfluence.org: could not connect to host +ngtoys.com.br: could not connect to host nico.st: could not connect to host nienfun.com: could not connect to host nikksno.io: could not connect to host @@ -894,6 +912,7 @@ nirada.info: could not connect to host nishikino-maki.com: could not connect to host niva.synology.me: could not connect to host nkadvertising.online: could not connect to host +nodelab-it.de: could not connect to host nonemu.ninja: could not connect to host norad.sytes.net: could not connect to host note7forever.com: could not connect to host @@ -901,11 +920,9 @@ notesforpebble.com: could not connect to host novascan.net: could not connect to host nowremindme.com: could not connect to host nsbfalconacademy.org: could not connect to host -nst-maroc.com: could not connect to host nudel.ninja: could not connect to host nulltime.net: could not connect to host nup.pw: could not connect to host -nupef.org.br: could not connect to host nyanpasu.tv: could not connect to host obdolbacca.ru: could not connect to host oberhof.co: could not connect to host @@ -914,7 +931,6 @@ ofer.site: could not connect to host off-the-clock.us: could not connect to host offgames.pro: could not connect to host office-ruru.com: could not connect to host -ohreally.de: could not connect to host oliverspringer.eu: could not connect to host onewebdev.info: could not connect to host onstud.com: could not connect to host @@ -924,6 +940,8 @@ opium.io: could not connect to host oreka.online: could not connect to host orovillelaw.com: could not connect to host oscsdp.cz: could not connect to host +osereso.tn: could not connect to host +osmanlitorunu.com: could not connect to host otinane.eu: could not connect to host ourchoice2016.com: could not connect to host outetc.com: could not connect to host @@ -962,7 +980,6 @@ persoform.ch: could not connect to host petlife.od.ua: could not connect to host peuf.shop: could not connect to host peykezamin.ir: could not connect to host -phcimages.com: could not connect to host phdwuda.com: could not connect to host philippa.cool: could not connect to host phoxmeh.com: could not connect to host @@ -1009,6 +1026,7 @@ psncardplus.dk: could not connect to host psncardplus.nl: could not connect to host psncardplus.se: could not connect to host psychintervention.com: could not connect to host +ptrujillo.com: could not connect to host publimepa.it: could not connect to host pugilares.com.pl: could not connect to host puhe.se: could not connect to host @@ -1027,7 +1045,6 @@ radical.org: could not connect to host rainbin.com: could not connect to host ranos.org: could not connect to host rapdogg.com: could not connect to host -raspberry.us: could not connect to host ravse.dk: could not connect to host rcoliveira.com: could not connect to host rdfz.tech: could not connect to host @@ -1035,9 +1052,9 @@ readify.com.au: could not connect to host readityourself.net: could not connect to host real-compare.com: could not connect to host realcli.com: could not connect to host +realestateradioshow.com: could not connect to host realraghavgupta.com: could not connect to host realwoo.com: could not connect to host -rechtsanwaeltin-vollmer.de: could not connect to host redstickfestival.org: could not connect to host reevu.net: could not connect to host regendevices.eu: could not connect to host @@ -1050,12 +1067,12 @@ research.md: could not connect to host ressl.ch: could not connect to host retcor.net: could not connect to host reth.ch: could not connect to host -rets.org.br: could not connect to host retube.ga: could not connect to host reykjavik.guide: could not connect to host ribopierre.fr: could not connect to host richeza.com: [Exception... "Component returned failure code: 0x80004005 (NS_ERROR_FAILURE) [nsISiteSecurityService.processHeader]" nsresult: "0x80004005 (NS_ERROR_FAILURE)" location: "JS frame :: /builds/slave/m-cen-l64-periodicupdate-00000/getHSTSPreloadList.js :: processStsHeader :: line 119" data: no] rishikeshyoga.in: could not connect to host +rngmeme.com: could not connect to host rob.uk.com: could not connect to host robomonkey.org: could not connect to host robust.ga: could not connect to host @@ -1074,7 +1091,7 @@ rs-devdemo.host: could not connect to host rsldb.com: could not connect to host rtc.fun: could not connect to host rubendv.be: could not connect to host -rudd-o.com: could not connect to host +rugk.dedyn.io: could not connect to host ruhr3.de: could not connect to host ruht.ro: could not connect to host runcarina.com: could not connect to host @@ -1083,7 +1100,6 @@ runementors.com: could not connect to host ruudkoot.nl: could not connect to host s0923.com: could not connect to host sa.net: could not connect to host -safe.moe: could not connect to host saferedirectlink.com: could not connect to host sallysubs.com: could not connect to host salzamt.tk: could not connect to host @@ -1107,6 +1123,7 @@ security.xn--q9jyb4c: could not connect to host securitysoapbox.com: could not connect to host securon.io: could not connect to host securoswiss.ch: could not connect to host +seefirm.com: could not connect to host seleondar.ru: could not connect to host sellmoretires.com: could not connect to host seoscribe.net: could not connect to host @@ -1116,7 +1133,6 @@ servfefe.com: could not connect to host servpanel.de: could not connect to host seryovpn.com: could not connect to host sesha.co.za: could not connect to host -sexgarage.de: could not connect to host shadex.net: could not connect to host shadiku.com: could not connect to host shadowplus.net: could not connect to host @@ -1141,6 +1157,7 @@ siku.pro: could not connect to host silvistefi.com: could not connect to host simbolo.co.uk: could not connect to host simplerses.com: could not connect to host +sinsojb.me: could not connect to host siqi.wang: could not connect to host skarox.com: could not connect to host skarox.net: could not connect to host @@ -1151,11 +1168,11 @@ skylocker.nl: could not connect to host skyvault.io: could not connect to host sl1pkn07.wtf: could not connect to host slovoice.org: could not connect to host +sluimann.de: could not connect to host slytech.ch: could not connect to host smileawei.com: could not connect to host smith.is: could not connect to host sml.lc: could not connect to host -snight.co: could not connect to host socialworkout.com: could not connect to host socialworkout.net: could not connect to host socialworkout.org: could not connect to host @@ -1163,6 +1180,7 @@ socialworkout.tv: could not connect to host socketize.com: could not connect to host sojingle.net: could not connect to host solidtuesday.com: could not connect to host +somali-derp.com: could not connect to host sonafe.info: could not connect to host sortaweird.net: could not connect to host soundhunter.xyz: could not connect to host @@ -1175,10 +1193,10 @@ sportsmanadvisor.com: could not connect to host squids.space: could not connect to host sqzryang.com: could not connect to host srvonfire.com: could not connect to host -sstewartgallus.com: could not connect to host stadionmanager.com: could not connect to host stadtgartenla.com: could not connect to host stamonicatourandtravel.com: could not connect to host +startuppeople.co.uk: could not connect to host statgram.me: could not connect to host static-assets.io: could not connect to host static.hosting: could not connect to host @@ -1192,7 +1210,7 @@ stonemanbrasil.com.br: could not connect to host stpip.com: could not connect to host streams.dyndns.org: could not connect to host stressfreehousehold.com: could not connect to host -studienportal.eu: could not connect to host +student.andover.edu: could not connect to host stupendous.net: could not connect to host stylle.me: could not connect to host sudo.im: could not connect to host @@ -1230,16 +1248,17 @@ tenispopular.com: could not connect to host terra-x.net: could not connect to host terrax.net: could not connect to host testbawks.com: could not connect to host +testovaci.ml: could not connect to host tetsai.com: could not connect to host thagki9.com: could not connect to host the-digitale.com: could not connect to host +the-finance-blog.com: could not connect to host the-gist.io: could not connect to host thedarkartsandcrafts.com: could not connect to host thefox.co: could not connect to host thefox.com.fr: could not connect to host thefrk.xyz: could not connect to host thenrdhrd.nl: could not connect to host -theojones.name: could not connect to host theprivacysolution.com: could not connect to host thermique.ch: could not connect to host thesehighsandlows.com: could not connect to host @@ -1294,7 +1313,6 @@ uni2share.com: could not connect to host unicorn.li: could not connect to host unirenter.ru: could not connect to host uploadbro.com: could not connect to host -upr.com.ua: could not connect to host urcentral.org: could not connect to host uscp8.com: could not connect to host usportsgo.com: could not connect to host @@ -1316,10 +1334,12 @@ versfin.net: could not connect to host veryyounglesbians.com: could not connect to host vgatest.nl: could not connect to host videorullen.se: could not connect to host +viewmyrecords.com: could not connect to host vimeosucks.nyc: could not connect to host vinetalk.net: could not connect to host visionthroughknowledge.com: could not connect to host visiontree.eu: could not connect to host +vistaalmar.es: could not connect to host vitoye.com: could not connect to host vkino.com: could not connect to host vlogge.com: could not connect to host @@ -1351,7 +1371,6 @@ webart-factory.de: could not connect to host webbson.net: could not connect to host webcatechism.com: could not connect to host webhackspro.com: could not connect to host -webkeks.org: could not connect to host webproject.rocks: could not connect to host webslake.com: could not connect to host webspotter.nl: could not connect to host @@ -1372,9 +1391,11 @@ weyland.tech: could not connect to host whereisjason.com: could not connect to host whereismyorigin.cf: could not connect to host whilsttraveling.com: could not connect to host +whitworth.nyc: could not connect to host wibuw.com: could not connect to host wilhelm-nathan.de: could not connect to host willkommen-fuerstenberg.de: could not connect to host +wimbo.nl: could not connect to host winnersports.co: could not connect to host winsufi.biz: could not connect to host wipply.com: could not connect to host @@ -1389,7 +1410,6 @@ wolfenland.net: could not connect to host wollongongbaptist.hopto.org: could not connect to host wonderbooks.club: could not connect to host woomu.me: could not connect to host -wooplagaming.com: could not connect to host workemy.com: could not connect to host worldfree4.org: could not connect to host wp-fastsearch.de: could not connect to host @@ -1401,6 +1421,7 @@ www-8887999.com: could not connect to host www.re: could not connect to host www.sb: could not connect to host www.simbolo.co.uk: could not connect to host +x-iweb.ru: could not connect to host xbc.nz: could not connect to host xeonlab.com: could not connect to host xeonlab.de: could not connect to host @@ -1410,7 +1431,9 @@ xing.ml: could not connect to host xn--8mr166hf6s.xn--fiqs8s: could not connect to host xn--erklderbarenben-slbh.dk: could not connect to host xn--srenpind-54a.dk: could not connect to host +xn--uist1idrju3i.jp: could not connect to host xn--yj8h0m.ws: could not connect to host +xpressprint.com.br: could not connect to host xpwn.cz: could not connect to host xuntaosms.com: could not connect to host xwaretech.info: could not connect to host @@ -1430,7 +1453,6 @@ ying299.com: could not connect to host ying299.net: could not connect to host yobst.tk: could not connect to host yoga.is-an-engineer.com: could not connect to host -yogananda-roma.org: could not connect to host yoramvandevelde.net: could not connect to host yotilabs.com: could not connect to host yourznc.com: could not connect to host @@ -1467,7 +1489,7 @@ zzw.ca: could not connect to host 0005aa.com: could not connect to host 007sascha.de: did not receive HSTS header 020wifi.nl: [Exception... "Component returned failure code: 0x80004005 (NS_ERROR_FAILURE) [nsISiteSecurityService.processHeader]" nsresult: "0x80004005 (NS_ERROR_FAILURE)" location: "JS frame :: /builds/slave/m-cen-l64-periodicupdate-00000/getHSTSPreloadList.js :: processStsHeader :: line 119" data: no] -0222aa.com: did not receive HSTS header +0222aa.com: could not connect to host 048.ag: could not connect to host 050508.com: could not connect to host 0f.io: could not connect to host @@ -1546,7 +1568,7 @@ zzw.ca: could not connect to host 2intermediate.co.uk: did not receive HSTS header 2or3.tk: could not connect to host 2smart4food.com: did not receive HSTS header -2ss.jp: could not connect to host +2ss.jp: did not receive HSTS header 300651.ru: did not receive HSTS header 300mbmovie24.com: did not receive HSTS header 300mbmovies4u.cc: could not connect to host @@ -1587,7 +1609,7 @@ zzw.ca: could not connect to host 4eyes.ch: did not receive HSTS header 4miners.net: could not connect to host 4mybaby.ch: did not receive HSTS header -4ourty2.org: did not receive HSTS header +4ourty2.org: could not connect to host 4sqsu.eu: could not connect to host 4w-performers.link: could not connect to host 50millionablaze.org: could not connect to host @@ -1749,7 +1771,7 @@ afp548.tk: could not connect to host after.im: did not receive HSTS header afvallendoeje.nu: could not connect to host afyou.co.kr: could not connect to host -afzco.asia: could not connect to host +afzco.asia: did not receive HSTS header agalaxyfarfaraway.co.uk: could not connect to host agatheetraphael.fr: could not connect to host agbremen.de: did not receive HSTS header @@ -1914,14 +1936,12 @@ anfsanchezo.co: could not connect to host anfsanchezo.me: could not connect to host angeloroberto.ch: did not receive HSTS header anghami.com: did not receive HSTS header -anglesya.win: did not receive HSTS header anglictinatabor.cz: could not connect to host angryroute.com: could not connect to host animal-nature-human.com: did not receive HSTS header anime1video.tk: could not connect to host animeday.ml: could not connect to host animesfusion.com.br: could not connect to host -animesharp.com: could not connect to host animurecs.com: did not receive HSTS header aniplus.cf: could not connect to host aniplus.gq: could not connect to host @@ -2087,7 +2107,6 @@ auditmatrix.com: did not receive HSTS header augias.org: could not connect to host augrandinquisiteur.com: did not receive HSTS header aujapan.ru: could not connect to host -aulo.in: did not receive HSTS header aurainfosec.com: did not receive HSTS header aurainfosec.com.au: did not receive HSTS header auraredeye.com: could not connect to host @@ -2409,7 +2428,6 @@ blindsexdate.nl: did not receive HSTS header blitzprog.org: did not receive HSTS header blmiller.com: could not connect to host blocksatz-medien.de: could not connect to host -blog-grupom2.es: did not receive HSTS header blog-ritaline.com: could not connect to host blog.coffee: could not connect to host blog.cyveillance.com: did not receive HSTS header @@ -2509,7 +2527,6 @@ brettpemberton.xyz: did not receive HSTS header brickoo.com: could not connect to host brickyardbuffalo.com: did not receive HSTS header bridholm.se: could not connect to host -brightstarkids.com.au: did not receive HSTS header brilliantbuilders.co.uk: did not receive HSTS header britzer-toner.de: did not receive HSTS header brix.ninja: did not receive HSTS header @@ -2585,7 +2602,6 @@ buvinghausen.com: max-age too low: 86400 buybaby.eu: did not receive HSTS header buyfox.de: did not receive HSTS header buynowdepot.com: did not receive HSTS header -buzz.tools: did not receive HSTS header buzzconcert.com: could not connect to host buzztelco.com.au: did not receive HSTS header bw81.xyz: could not connect to host @@ -2831,6 +2847,7 @@ chrome: could not connect to host chrome-devtools-frontend.appspot.com: did not receive HSTS header (error ignored - included regardless) chrome.google.com: did not receive HSTS header (error ignored - included regardless) chrst.ph: could not connect to host +chs.us: did not receive HSTS header chua.cf: could not connect to host chuckame.fr: did not receive HSTS header chulado.com: did not receive HSTS header @@ -2925,6 +2942,7 @@ codabix.de: could not connect to host codabix.net: could not connect to host code-35.com: could not connect to host code-digsite.com: could not connect to host +code-judge.tk: did not receive HSTS header code.google.com: did not receive HSTS header (error ignored - included regardless) codealkemy.co: max-age too low: 43200 codeco.pw: could not connect to host @@ -3105,7 +3123,7 @@ crudysql.com: could not connect to host crufad.org: did not receive HSTS header cruikshank.com.au: could not connect to host cruzr.xyz: could not connect to host -crypt.guru: could not connect to host +crypt.guru: did not receive HSTS header crypticshell.co.uk: could not connect to host cryptify.eu: could not connect to host cryptobin.org: could not connect to host @@ -3202,7 +3220,6 @@ damianuv-blog.cz: did not receive HSTS header danbarrett.com.au: did not receive HSTS header dancerdates.net: could not connect to host dane-bre.net: did not receive HSTS header -daniel-du.com: could not connect to host daniel-mosquera.com: could not connect to host daniel-steuer.de: could not connect to host danielcowie.me: could not connect to host @@ -3220,7 +3237,7 @@ danwillenberg.com: did not receive HSTS header daolerp.xyz: could not connect to host dargasia.is: could not connect to host dario.im: could not connect to host -dariosirangelo.me: did not receive HSTS header +dariosirangelo.me: could not connect to host dark-x.cf: could not connect to host darkanzali.pl: max-age too low: 0 darkfriday.ddns.net: could not connect to host @@ -3368,10 +3385,12 @@ diablotine.rocks: could not connect to host diagnosia.com: did not receive HSTS header diamondcare.com.br: could not connect to host dianlujitao.com: did not receive HSTS header +diannaobos.com: did not receive HSTS header dicando.com: max-age too low: 2592000 dicelab.co.uk: could not connect to host dicionariofinanceiro.com: did not receive HSTS header dicionariopopular.com: did not receive HSTS header +dicoding.com: did not receive HSTS header dieb.photo: could not connect to host diejanssens.net: did not receive HSTS header dierenkruiden.nl: could not connect to host @@ -3398,7 +3417,6 @@ dingcc.org: could not connect to host dingcc.xyz: could not connect to host dinkum.online: could not connect to host dipconsultants.com: could not connect to host -direct2uk.com: did not receive HSTS header directhskincream.com: could not connect to host directorinegocis.cat: could not connect to host direnv.net: did not receive HSTS header @@ -3505,7 +3523,7 @@ doveholesband.co.uk: did not receive HSTS header dovetailnow.com: could not connect to host download.jitsi.org: did not receive HSTS header downsouthweddings.com.au: could not connect to host -doxcelerate.com: max-age too low: 69 +doxcelerate.com: could not connect to host dr-becarelli-philippe.chirurgiens-dentistes.fr: did not receive HSTS header drach.xyz: did not receive HSTS header dragonisles.net: could not connect to host @@ -3569,6 +3587,7 @@ dungi.org: could not connect to host duole30.com: did not receive HSTS header duongpho.com: did not receive HSTS header duskopy.top: could not connect to host +dutchessuganda.com: did not receive HSTS header dutchrank.com: did not receive HSTS header duuu.ch: could not connect to host dycem-ns.com: did not receive HSTS header @@ -3885,6 +3904,7 @@ exgravitus.com: could not connect to host exno.co: could not connect to host exousiakaidunamis.xyz: could not connect to host expertmile.com: did not receive HSTS header +exploravacations.in: did not receive HSTS header expo-designers.com: did not receive HSTS header expressfinance.co.za: did not receive HSTS header extrathemeshowcase.net: could not connect to host @@ -3931,7 +3951,6 @@ falconwiz.com: did not receive HSTS header falkhusemann.de: did not receive HSTS header falkp.no: did not receive HSTS header fallenangelspirits.uk: could not connect to host -fallofthecitadel.com: did not receive HSTS header faluninfo.ba: did not receive HSTS header fam-weyer.de: could not connect to host fame-agency.net: could not connect to host @@ -4262,6 +4281,7 @@ gamesdepartment.co.uk: did not receive HSTS header gameserver-sponsor.de: did not receive HSTS header gamesurferapp.com: could not connect to host gamingmedia.eu: did not receive HSTS header +gamoice.com: did not receive HSTS header gampenhof.de: did not receive HSTS header garageon.net: did not receive HSTS header garciamartin.me: could not connect to host @@ -4354,6 +4374,7 @@ gilcloud.com: could not connect to host gilgaz.com: did not receive HSTS header gillet-cros.fr: could not connect to host gilly.berlin: did not receive HSTS header +gilroywestwood.org: did not receive HSTS header gincher.net: did not receive HSTS header gingali.de: did not receive HSTS header ginijony.com: did not receive HSTS header @@ -4915,7 +4936,7 @@ igforums.com: could not connect to host igiftcards.nl: did not receive HSTS header ignatisd.gr: did not receive HSTS header igule.net: could not connect to host -ihotel.io: could not connect to host +ihotel.io: did not receive HSTS header ihrlotto.de: could not connect to host ihrnationalrat.ch: could not connect to host ihsbsd.me: could not connect to host @@ -5188,6 +5209,7 @@ jameshale.me: did not receive HSTS header jamesmaurer.com: did not receive HSTS header jami.am: did not receive HSTS header jamourtney.com: could not connect to host +jan-cermak.cz: did not receive HSTS header jan-daniels.de: did not receive HSTS header jan-roenspies.de: could not connect to host jan27.org: did not receive HSTS header @@ -5349,8 +5371,8 @@ juka.pp.ua: did not receive HSTS header juliamweber.de: could not connect to host julian-kipka.de: did not receive HSTS header julian-witusch.de: could not connect to host -julianvmodesto.com: did not receive HSTS header julido.de: did not receive HSTS header +juliemaurel.fr: did not receive HSTS header jumbox.xyz: could not connect to host jumbster.com: max-age too low: 2592000 jumping-duck.com: could not connect to host @@ -5468,6 +5490,7 @@ kinderwagen-test24.de: could not connect to host kindlyfire.com: could not connect to host kindof.ninja: could not connect to host kingmanhall.org: could not connect to host +kingopen.cn: max-age too low: 0 kinkdr.com: could not connect to host kinniyaonlus.com: did not receive HSTS header kinnon.enterprises: could not connect to host @@ -5657,7 +5680,7 @@ lanseyujie.com: max-age too low: 2592000 lansinoh.co.uk: did not receive HSTS header lanzainc.xyz: did not receive HSTS header laobox.fr: could not connect to host -laospage.com: could not connect to host +laospage.com: did not receive HSTS header laplaceduvillage.net: could not connect to host laquack.com: could not connect to host laredsemanario.com: could not connect to host @@ -5804,6 +5827,7 @@ linuxforyou.com: could not connect to host linuxgeek.ro: could not connect to host linuxmint.cz: could not connect to host linuxmonitoring.net: did not receive HSTS header +lipo.lol: did not receive HSTS header liquid.solutions: did not receive HSTS header liquorsanthe.in: could not connect to host lisaco.de: could not connect to host @@ -5871,6 +5895,7 @@ loopstart.org: could not connect to host loqyu.co: max-age too low: 2592000 lordjevington.co.uk: could not connect to host lost.host: did not receive HSTS header +lostandcash.com: did not receive HSTS header lostg.com: did not receive HSTS header lostinsecurity.com: could not connect to host lostinweb.eu: could not connect to host @@ -5915,6 +5940,7 @@ lumi.pw: could not connect to host lunarift.com: could not connect to host lunarlog.com: could not connect to host lunarrift.net: could not connect to host +lunasqu.ee: did not receive HSTS header luneta.nearbuysystems.com: could not connect to host luno.io: could not connect to host luody.info: could not connect to host @@ -5957,7 +5983,7 @@ madars.org: did not receive HSTS header maddin.ga: could not connect to host madebyfalcon.co.uk: did not receive HSTS header madebymagnitude.com: did not receive HSTS header -madeinorder.com: did not receive HSTS header +madeinorder.com: could not connect to host mademoiselle-emma.be: did not receive HSTS header mademoiselle-emma.fr: did not receive HSTS header maderwin.com: did not receive HSTS header @@ -6027,7 +6053,7 @@ mansion-note.com: did not receive HSTS header manududu.com.br: did not receive HSTS header maomaofuli.vip: could not connect to host maple5.com: did not receive HSTS header -mapresidentielle.fr: could not connect to host +mapresidentielle.fr: did not receive HSTS header marcelparra.com: could not connect to host marchagen.nl: did not receive HSTS header marco01809.net: could not connect to host @@ -6069,6 +6095,7 @@ martinec.co.uk: could not connect to host martinestyle.com: could not connect to host martineve.com: did not receive HSTS header martinp.no: could not connect to host +martinreed.net: did not receive HSTS header martinrogalla.com: did not receive HSTS header marumagic.com: did not receive HSTS header marykshoup.com: did not receive HSTS header @@ -6138,7 +6165,6 @@ mcmillansedationdentistry.com: did not receive HSTS header mcooperlaw.com: did not receive HSTS header mcuexchange.com: did not receive HSTS header mdfnet.se: did not receive HSTS header -mdkr.nl: did not receive HSTS header mdscomp.net: did not receive HSTS header meadowfen.farm: could not connect to host meadowfenfarm.com: could not connect to host @@ -6153,7 +6179,6 @@ mediafinancelab.org: did not receive HSTS header mediamag.am: max-age too low: 0 mediastorm.us: could not connect to host mediawikicn.org: could not connect to host -medicalcountermeasures.gov: did not receive HSTS header medienservice-fritz.de: did not receive HSTS header medirich.co: could not connect to host meditek-dv.ru: did not receive HSTS header @@ -6305,6 +6330,7 @@ minikneet.nl: could not connect to host minimaliston.com: did not receive HSTS header minimoo.se: could not connect to host minis-hip.de: max-age too low: 172800 +minkondom.nu: did not receive HSTS header minnesotadata.com: could not connect to host minora.io: could not connect to host minoris.se: could not connect to host @@ -6371,7 +6397,7 @@ moe4sale.in: did not receive HSTS header moebel-nagel.de: did not receive HSTS header moegirl.org: did not receive HSTS header moellers.it: could not connect to host -moeloli.pw: could not connect to host +moeloli.pw: did not receive HSTS header moelord.org: could not connect to host moen.io: could not connect to host moevenpick-cafe.com: did not receive HSTS header @@ -6403,10 +6429,11 @@ monsieurbureau.com: did not receive HSTS header montanacures.org: could not connect to host montanwerk.de: did not receive HSTS header montonicms.com: could not connect to host +moobo.xyz: did not receive HSTS header moon.lc: could not connect to host moonless.net: could not connect to host moonloupe.com: could not connect to host -moosemanstudios.com: could not connect to host +moosemanstudios.com: did not receive HSTS header moov.is: could not connect to host moparisthebest.biz: could not connect to host moparisthebest.info: could not connect to host @@ -6522,6 +6549,7 @@ mygov.scot: did not receive HSTS header myhair.asia: did not receive HSTS header myiocc.org: could not connect to host myip.tech: max-age too low: 2592000 +myjumpsuit.de: did not receive HSTS header mykolab.com: did not receive HSTS header mykreuzfahrt.de: could not connect to host mymp3singer.site: did not receive HSTS header @@ -6734,6 +6762,7 @@ nolimitsbook.de: did not receive HSTS header nolte.work: could not connect to host nomorebytes.de: could not connect to host noodlesandwich.com: did not receive HSTS header +nootropicsource.com: did not receive HSTS header nope.website: could not connect to host nopex.no: could not connect to host nopol.de: could not connect to host @@ -6827,7 +6856,6 @@ oasis.mobi: could not connect to host oben.pl: did not receive HSTS header obscuredfiles.com: could not connect to host obsydian.org: could not connect to host -occentus.net: did not receive HSTS header occupymedia.org: did not receive HSTS header ochaken.cf: could not connect to host ocrami.us: did not receive HSTS header @@ -7169,7 +7197,6 @@ pet-nsk.ru: could not connect to host petbooking.it: did not receive HSTS header petchart.net: could not connect to host peterkshultz.com: did not receive HSTS header -peterlew.is: did not receive HSTS header petersmark.com: did not receive HSTS header pethub.com: did not receive HSTS header petit.site: could not connect to host @@ -7301,6 +7328,7 @@ pointeringles.com: could not connect to host pointiswunderland.de: could not connect to host pointpro.de: did not receive HSTS header pokeduel.me: did not receive HSTS header +pokomichi.com: did not receive HSTS header pol.in.th: could not connect to host polarityschule.com: did not receive HSTS header pole.net.nz: could not connect to host @@ -7332,7 +7360,6 @@ portalplatform.net: could not connect to host portaluniversalista.org: could not connect to host portalzine.de: did not receive HSTS header poshpak.com: max-age too low: 86400 -postback.io: did not receive HSTS header postcodewise.co.uk: did not receive HSTS header posterspy.com: did not receive HSTS header postscheduler.org: could not connect to host @@ -7462,6 +7489,7 @@ puiterwijk.org: could not connect to host pulsar.guru: did not receive HSTS header pult.co: could not connect to host pumpgames.net: could not connect to host +punchkickinteractive.com: did not receive HSTS header punchr-kamikazee.rhcloud.com: did not receive HSTS header puppydns.com: did not receive HSTS header purewebmasters.com: could not connect to host @@ -7564,7 +7592,7 @@ rany.io: could not connect to host rany.pw: could not connect to host rapidresearch.me: could not connect to host rapidthunder.io: could not connect to host -rasing.me: did not receive HSTS header +rasing.me: could not connect to host rastreador.com.es: did not receive HSTS header ratajczak.fr: could not connect to host rate-esport.de: could not connect to host @@ -7667,7 +7695,7 @@ remotestance.com: did not receive HSTS header rencaijia.com: did not receive HSTS header rengarenkblog.com: could not connect to host renideo.fr: could not connect to host -renkhosting.com: could not connect to host +renkhosting.com: did not receive HSTS header renlong.org: did not receive HSTS header renrenss.com: could not connect to host renscreations.com: did not receive HSTS header @@ -7710,7 +7738,6 @@ reviews.anime.my: max-age too low: 5184000 revtut.net: could not connect to host rewardstock.com: max-age too low: 0 rewopit.net: did not receive HSTS header -rgavmf.ru: did not receive HSTS header rhapsodhy.hu: could not connect to host rhdigital.pro: could not connect to host rhering.de: could not connect to host @@ -7739,7 +7766,6 @@ ring0.xyz: did not receive HSTS header ringh.am: could not connect to host rionewyork.com.br: could not connect to host ripa.io: did not receive HSTS header -ripple.com: did not receive HSTS header rippleunion.com: could not connect to host riskmgt.com.au: could not connect to host rithm.ch: could not connect to host @@ -7853,7 +7879,6 @@ s-rickroll-p.pw: could not connect to host s.how: could not connect to host s1mplescripts.de: did not receive HSTS header saabwa.org: did not receive HSTS header -sabrinajoiasprontaentrega.com.br: did not receive HSTS header sadsu.com: did not receive HSTS header safeex.com: did not receive HSTS header safelist.eu: did not receive HSTS header @@ -7896,7 +7921,7 @@ sanissimo.com.mx: max-age too low: 86400 sansage.com.br: could not connect to host sansdev.com: could not connect to host sansemea.com: did not receive HSTS header -santing.net: did not receive HSTS header +santing.net: could not connect to host santouri.be: could not connect to host saotn.org: did not receive HSTS header sapk.fr: did not receive HSTS header @@ -7982,7 +8007,7 @@ scribbleserver.com: could not connect to host scribe.systems: could not connect to host scrion.com: could not connect to host script.google.com: did not receive HSTS header (error ignored - included regardless) -scriptenforcer.net: could not connect to host +scriptenforcer.net: did not receive HSTS header scriptict.nl: could not connect to host scrollstory.com: did not receive HSTS header sdhmanagementgroup.com: could not connect to host @@ -8082,7 +8107,6 @@ servercode.ca: did not receive HSTS header serverdensity.io: did not receive HSTS header servergno.me: did not receive HSTS header servermonkey.nl: could not connect to host -serversftw.com: did not receive HSTS header servicevie.com: did not receive HSTS header servious.org: could not connect to host servu.de: did not receive HSTS header @@ -8208,7 +8232,6 @@ simplepractice.com: did not receive HSTS header simplexsupport.com: did not receive HSTS header simplixos.org: could not connect to host simplyenak.com: did not receive HSTS header -simtin-net.de: did not receive HSTS header simyo.nl: did not receive HSTS header sin30.net: could not connect to host sincai666.com: could not connect to host @@ -8512,6 +8535,7 @@ stole-my.bike: could not connect to host stole-my.tv: could not connect to host stolkschepen.nl: did not receive HSTS header stonecutterscommunity.com: could not connect to host +stopbreakupnow.org: did not receive HSTS header stopwoodfin.org: could not connect to host storbritannien.guide: could not connect to host storecove.com: did not receive HSTS header @@ -8746,7 +8770,7 @@ technotonic.com.au: did not receive HSTS header techpointed.com: could not connect to host techproud.com: did not receive HSTS header techreview.link: could not connect to host -techtoy.store: could not connect to host +techtoy.store: did not receive HSTS header techtraveller.com.au: did not receive HSTS header tecnimotos.com: did not receive HSTS header tecnogaming.com: did not receive HSTS header @@ -8963,6 +8987,7 @@ timschubert.net: max-age too low: 172800 timwittenberg.com: could not connect to host tinchbear.xyz: could not connect to host tindewen.net: could not connect to host +tintenprofi.de: max-age too low: 6307200 tipsyk.ru: could not connect to host tiredofeating.com: could not connect to host tiremoni.ch: did not receive HSTS header @@ -9319,7 +9344,7 @@ urlchomp.com: did not receive HSTS header urphp.com: could not connect to host us-immigration.com: did not receive HSTS header usaab.org: did not receive HSTS header -usbirthcertificate.com: did not receive HSTS header +usbirthcertificate.com: could not connect to host usbtypeccompliant.com: could not connect to host uscitizenship.info: did not receive HSTS header uscntalk.com: could not connect to host @@ -9383,7 +9408,6 @@ vanestack.com: could not connect to host vanitas.xyz: could not connect to host vanitynailworkz.com: could not connect to host vansieleghem.com: could not connect to host -vapordepot.jp: did not receive HSTS header vasa-webstranka.sk: did not receive HSTS header vasanth.org: could not connect to host vbest.net: could not connect to host @@ -9432,7 +9456,6 @@ vicianovi.cz: could not connect to host victorenxovais.com.br: could not connect to host victoriapemberton.com: did not receive HSTS header vid.me: did not receive HSTS header -vida-it.com: did not receive HSTS header vidbuchanan.co.uk: did not receive HSTS header viddiaz.com: did not receive HSTS header videomail.io: did not receive HSTS header @@ -9587,7 +9610,6 @@ waterforlife.net.au: did not receive HSTS header waterpoint.com.br: could not connect to host watersportmarkt.net: did not receive HSTS header watsonhall.uk: could not connect to host -wattechweb.com: did not receive HSTS header wave.is: could not connect to host wavefloatrooms.com: did not receive HSTS header wavefrontsystemstech.com: could not connect to host @@ -9606,7 +9628,6 @@ webbx.se: max-age too low: 2592000 webchat.domains: did not receive HSTS header webdeflect.com: did not receive HSTS header webdesign-kronberg.de: did not receive HSTS header -webdesignssussex.co.uk: did not receive HSTS header webdev.mobi: could not connect to host webeconomia.it: did not receive HSTS header webelement.sk: did not receive HSTS header @@ -9654,7 +9675,7 @@ weme.eu: could not connect to host wendalyncheng.com: did not receive HSTS header wenz.io: did not receive HSTS header werdeeintimo.de: did not receive HSTS header -werkenbijkfc.nl: did not receive HSTS header +werkenbijkfc.nl: could not connect to host werkplaatsoost.nl: did not receive HSTS header werkruimtebottendaal.nl: could not connect to host wesleyharris.ca: did not receive HSTS header @@ -9812,7 +9833,7 @@ www-8003.com: did not receive HSTS header www-88599.com: did not receive HSTS header www-9995.com: did not receive HSTS header www-djbet.com: did not receive HSTS header -www-jinshavip.com: did not receive HSTS header +www-jinshavip.com: could not connect to host www.cueup.com: could not connect to host www.cyveillance.com: did not receive HSTS header www.developer.mydigipass.com: could not connect to host @@ -9909,6 +9930,7 @@ xn--milchaufschumer-test-lzb.de: could not connect to host xn--neb-tma3u8u.xyz: could not connect to host xn--pck4e3a2ex597b4ml.xyz: did not receive HSTS header xn--qckqc0nxbyc4cdb4527err7c.biz: did not receive HSTS header +xn--wmq.jp: did not receive HSTS header xn--xdtx3pfzbiw3ar8e7yedqrhui.com: could not connect to host xn--yoamomisuasbcn-ynb.com: could not connect to host xn--zck9a4b352yuua.jp: did not receive HSTS header @@ -9983,6 +10005,7 @@ yoloseo.com: could not connect to host yomepre.com: could not connect to host yopers.com: did not receive HSTS header yoru.me: did not receive HSTS header +youcaitian.com: did not receive HSTS header youcontrol.ru: could not connect to host youfencun.com: did not receive HSTS header youlog.net: could not connect to host diff --git a/security/manager/ssl/nsSTSPreloadList.inc b/security/manager/ssl/nsSTSPreloadList.inc index d051315a2c4b..1795cde840b6 100644 --- a/security/manager/ssl/nsSTSPreloadList.inc +++ b/security/manager/ssl/nsSTSPreloadList.inc @@ -8,7 +8,7 @@ /*****************************************************************************/ #include -const PRTime gPreloadListExpirationTime = INT64_C(1524594783507000); +const PRTime gPreloadListExpirationTime = INT64_C(1524681233383000); %% 0-1.party, 1 0.me.uk, 1 @@ -1695,6 +1695,7 @@ angelinahair.com, 1 angeloventuri.com, 1 anginf.de, 1 anglertanke.de, 1 +anglesya.win, 1 anglictina-sojcak.cz, 1 anglictinasojcak.cz, 1 anglingactive.co.uk, 1 @@ -1726,6 +1727,7 @@ anime1.pw, 1 anime1.top, 1 animeai.com, 1 animefluxxx.com, 1 +animesharp.com, 1 animorphsfanforum.com, 1 anipassion.com, 1 anita-mukorom.hu, 1 @@ -2466,6 +2468,7 @@ augustiner-kantorei-erfurt.de, 1 augustiner-kantorei.de, 1 aukaraoke.su, 1 aulaschrank.gq, 1 +aulo.in, 0 aunali1.com, 1 auntie-eileens.com.au, 1 auplidespages.fr, 1 @@ -2963,7 +2966,7 @@ bazos.cz, 1 bazos.sk, 1 bazziergraphik.com, 1 bb37roma.it, 1 -bbb1991.me, 1 +bbb1991.me, 0 bbcastles.com, 1 bbdos.ru, 1 bbgeschenke.ch, 1 @@ -3781,6 +3784,7 @@ blockmetry.com, 1 blockstream.com, 1 blockxit.de, 1 bloemendal.me, 1 +blog-grupom2.es, 1 blog.gov.uk, 1 blog.gparent.org, 1 blog.linode.com, 0 @@ -3942,7 +3946,7 @@ bondskampeerder.nl, 1 bonesserver.com, 1 bonfi.net, 1 bonifacius.be, 1 -bonigo.de, 0 +bonigo.de, 1 bonita.com.br, 1 bonnant-associes.ch, 1 bonnant-partners.ch, 1 @@ -4354,6 +4358,7 @@ brightonbank.com, 1 brightonbouncycastles.net, 1 brightonchilli.org.uk, 1 brightstarkids.co.uk, 0 +brightstarkids.com.au, 0 brightstarkids.net, 0 brightstarkids.sg, 0 brigidaarie.com, 1 @@ -4626,6 +4631,7 @@ buypapercheap.net, 1 buyseo.store, 1 buyshoe.org, 1 buytheway.co.za, 1 +buzz.tools, 1 buzzconf.io, 1 buzzdeck.com, 1 buzzprint.it, 1 @@ -5639,7 +5645,6 @@ chronoproject.com, 1 chronoshop.cz, 1 chrpaul.de, 1 chrstn.eu, 1 -chs.us, 1 chsh.moe, 1 chsterz.de, 1 chua.family, 1 @@ -5722,7 +5727,7 @@ cirugiasplasticas.com.mx, 1 cirujanooral.com, 1 cirurgicagervasio.com.br, 1 cirurgicalucena.com.br, 1 -ciscodude.net, 0 +ciscodude.net, 1 cisoaid.com, 1 ciss.ltd, 1 cisy.me, 1 @@ -6030,7 +6035,6 @@ coda.moe, 1 coda.today, 1 coda.world, 1 code-golf.io, 1 -code-judge.tk, 1 code-poets.co.uk, 1 code-well.com, 1 code.facebook.com, 0 @@ -7107,6 +7111,7 @@ dandymrsb.com, 1 daneandthepain.com, 1 dango.in, 1 daniel-baumann.ch, 1 +daniel-du.com, 1 daniel-kulbe.de, 1 daniel-ruf.de, 1 daniel-seifert.com, 1 @@ -7822,7 +7827,6 @@ diamondyze.nl, 1 diamorphine.com, 1 diamsmedia.ch, 1 dianefriedli.ch, 1 -diannaobos.com, 1 dianurse.com, 1 diare-na-miru.cz, 1 diario-egipto.com, 1 @@ -7848,7 +7852,6 @@ dicionarioetimologico.com.br, 1 dick.red, 1 dickieslife.com, 1 dickpics.ru, 1 -dicoding.com, 1 didacte.com, 1 didche.net, 1 diddens.de, 1 @@ -7990,6 +7993,7 @@ dipling.de, 1 dipulse.it, 1 dir2epub.com, 1 dir2epub.org, 1 +direct2uk.com, 1 directebanking.com, 1 directinsure.in, 1 directlinkfunding.co.uk, 1 @@ -8023,7 +8027,7 @@ disconformity.net, 1 discord-chan.net, 1 discordapp.com, 1 discordghost.space, 1 -discotek.club, 1 +discotek.club, 0 discount24.de, 1 discountmania.eu, 1 discountmetaux.fr, 1 @@ -8647,7 +8651,6 @@ dustygroove.com, 1 dustyspokesbnb.ca, 1 dutch.desi, 1 dutch1.nl, 1 -dutchessuganda.com, 1 dutchrank.nl, 1 dutchwanderers.nl, 1 dutchweballiance.nl, 1 @@ -9459,7 +9462,7 @@ epiteugma.com, 1 epizentrum.work, 1 epizentrum.works, 1 epmcentroitalia.it, 1 -epoch.com, 0 +epoch.com, 1 epolitiker.com, 1 epos-distributor.co.uk, 1 eposbirmingham.co.uk, 1 @@ -9939,7 +9942,6 @@ exploit.party, 1 exploit.ph, 1 exploited.cz, 1 exploodo.rocks, 1 -exploravacations.in, 1 expo-america.ru, 1 expo-asia.ru, 1 expo-europe.ru, 1 @@ -10111,6 +10113,7 @@ fallenangeldrinks.eu, 1 fallenangelspirits.co.uk, 1 fallenangelspirits.com, 1 fallenspirits.co.uk, 1 +fallofthecitadel.com, 1 falsum.net, 1 fam-kreibich.de, 1 fam-stemmer.de, 1 @@ -11436,7 +11439,6 @@ gamingreinvented.com, 1 gamingwithcromulent.com, 1 gamingzoneservers.com, 1 gamishou.fr, 1 -gamoice.com, 1 gamoloco.com, 1 ganado.org, 1 gancedo.com.es, 1 @@ -11850,7 +11852,6 @@ gillmanandsoame.co.uk, 1 gillyscastles.co.uk, 1 gilmoreid.com.au, 1 gilnet.be, 1 -gilroywestwood.org, 1 gina-architektur.design, 1 ginie.de, 1 ginionusedcars.be, 1 @@ -14950,7 +14951,6 @@ jamstatic.fr, 0 jamyeprice.com, 1 jan-and-maaret.de, 1 jan-bucher.ch, 1 -jan-cermak.cz, 1 jan-rieger.de, 1 jan-von.de, 1 janada.cz, 1 @@ -15528,6 +15528,7 @@ julianickel.de, 1 julianmeyer.de, 1 juliansimioni.com, 1 julianskitchen.ch, 1 +julianvmodesto.com, 1 julianwallmeroth.de, 1 julianweigle.de, 1 julianxhokaxhiu.com, 1 @@ -15538,7 +15539,6 @@ julico.nl, 1 julie-and-stevens-wedding.com, 1 juliedecubber.com, 1 juliekoubova.net, 1 -juliemaurel.fr, 1 julienc.io, 1 julienpaterne.com, 1 julientartarin.com, 1 @@ -16127,7 +16127,6 @@ kingofthecastlecoventry.co.uk, 1 kingofthecastlesentertainments.co.uk, 1 kingofthecastlesouthwales.co.uk, 1 kingofthecastlesrhyl.co.uk, 1 -kingopen.cn, 1 kingpincages.com, 1 kingqueen.org.uk, 1 kingstclinic.com, 1 @@ -17475,7 +17474,6 @@ lionlyrics.com, 1 lionsdeal.com, 1 lipartydepot.com, 1 lipex.com, 1 -lipo.lol, 1 lipoabaltimore.org, 1 liqd.net, 1 liquid.cz, 1 @@ -17774,7 +17772,6 @@ loritaboegl.de, 1 losebellyfat.pro, 1 losless.fr, 1 loss.no, 1 -lostandcash.com, 1 lostarq.com, 1 lostingames.de, 1 lostkeys.co.uk, 1 @@ -17951,7 +17948,6 @@ lunar6.ch, 1 lunarshark.com, 1 lunarsoft.net, 1 lunartail.nl, 1 -lunasqu.ee, 1 lunchbunch.me, 1 lune-indigo.ch, 1 lungdoc.us, 0 @@ -18507,7 +18503,6 @@ martingansler.de, 1 martinkup.cz, 1 martinkus.eu, 1 martinmuc.de, 1 -martinreed.net, 1 martins.im, 1 martinsfamilyappliance.com, 1 martonmihaly.hu, 1 @@ -18779,6 +18774,7 @@ mdek.at, 1 mdewendt.de, 1 mdf-bis.com, 1 mdiv.pl, 1 +mdkr.nl, 1 mdma.net, 1 mdmed.clinic, 1 mdoering.de, 1 @@ -18840,6 +18836,7 @@ mediatorzy.waw.pl, 1 mediawiki.org, 1 mediawin.pl, 1 medic-world.com, 1 +medicalcountermeasures.gov, 1 medicinesfast.com, 0 medicinia.com.br, 1 medicinskavranje.edu.rs, 1 @@ -19335,7 +19332,6 @@ minipainting.net, 1 miniskipper.at, 1 minitruckin.net, 1 minitrucktalk.com, 1 -minkondom.nu, 1 minkymoon.jp, 1 minnesotakinkyyouth.org, 1 minnesotamathcorps.org, 1 @@ -19674,7 +19670,6 @@ montsaintaignan.fr, 1 montychristie.com, 1 moo.la, 1 moobo.co.jp, 1 -moobo.xyz, 1 moodfoods.com, 1 moodifiers.com, 1 moodzshop.com, 1 @@ -20166,7 +20161,6 @@ myicare.org, 1 myimds.com, 1 myimmitracker.com, 1 myjumparoo.co.uk, 1 -myjumpsuit.de, 1 mykeepsake.xyz, 0 myki.co, 1 mykontool.de, 1 @@ -21121,7 +21115,6 @@ noop.ch, 1 noordsee.de, 1 noorsolidarity.com, 1 nootropic.com, 1 -nootropicsource.com, 1 noovell.com, 1 nopaste.xyz, 1 nopaynocure.com, 1 @@ -21420,6 +21413,7 @@ oc-sa.ch, 1 ocad.com.au, 1 ocapic.com, 1 occasion-impro.com, 1 +occentus.net, 1 occmon.net, 1 ocd2016.com, 1 oceandns.eu, 1 @@ -22623,6 +22617,7 @@ peterfolta.net, 1 peterhuetz.at, 1 peterhuetz.com, 1 peterjohnson.io, 1 +peterlew.is, 1 peternagy.ie, 1 petersontoscano.com, 1 pethelpers.org, 1 @@ -23162,7 +23157,6 @@ pokemontabletopadventures.com, 1 pokemori.jp, 1 pokepon.center, 1 pokl.cz, 1 -pokomichi.com, 1 pol-expo.ru, 1 polaire.org, 1 polandb2b.directory, 1 @@ -23288,6 +23282,7 @@ post.io, 1 post4me.at, 1 postal.dk, 1 postal3.es, 1 +postback.io, 1 postblue.info, 1 postbox.life, 1 postcardpayment.com, 1 @@ -23805,7 +23800,6 @@ puli.com.br, 1 pulledporkheaven.com, 1 pulsedursley.co.uk, 1 pumperszene.com, 1 -punchkickinteractive.com, 1 puneflowermall.com, 1 punikonta.de, 1 punitsheth.com, 1 @@ -24682,6 +24676,7 @@ rezultant.ru, 1 rezun.cloud, 1 rf.tn, 1 rfeif.org, 1 +rgavmf.ru, 1 rgbinnovation.com, 1 rgcomportement.fr, 1 rgservers.com, 1 @@ -24778,6 +24773,7 @@ rio-weimar.de, 1 rioshop.com.br, 1 rip-sport.cz, 1 ripmixmake.org, 1 +ripple.com, 1 ris.fi, 1 risada.nl, 1 risaphuketproperty.com, 1 @@ -25297,6 +25293,7 @@ sabahattin-gucukoglu.com, 1 sabatek.pl, 1 sabine-forschbach.de, 1 sabineforschbach.de, 1 +sabrinajoiasprontaentrega.com.br, 1 sacaentradas.com, 1 saccani.net, 1 sackers.com, 1 @@ -26172,6 +26169,7 @@ serverlog.net, 1 serveroffline.net, 0 serverpedia.de, 1 servers4all.co.uk, 1 +serversftw.com, 1 serverstuff.info, 1 serversuit.com, 1 servertastic.com, 1 @@ -26691,6 +26689,7 @@ simpte.com, 1 simpul.nl, 1 sims4hub.ga, 1 simsnieuws.nl, 1 +simtin-net.de, 1 simukti.net, 1 simumiehet.com, 1 simus.fr, 1 @@ -27876,7 +27875,6 @@ stonewuu.com, 1 stony.com, 1 stonystratford.org, 1 stopakwardhandshakes.org, 1 -stopbreakupnow.org, 1 stopbullying.gov, 1 stopfraud.gov, 1 stopthethyroidmadness.com, 1 @@ -29409,7 +29407,6 @@ tintencenter.com, 1 tintenfix.net, 1 tintenfux.de, 1 tintenland.de, 1 -tintenprofi.de, 1 tinyhousefinance.com.au, 1 tinylan.com, 1 tinyspeck.com, 1 @@ -30799,6 +30796,7 @@ vapesense.co.uk, 1 vapeshopsupply.com, 0 vaphone.co, 1 vapor.cloud, 0 +vapordepot.jp, 1 varcare.jp, 1 varden.info, 1 vareillefoundation.fr, 1 @@ -31004,6 +31002,7 @@ victornet.de, 1 victornilsson.pw, 1 vicyu.com, 1 vid-immobilien.de, 1 +vida-it.com, 1 vida.es, 1 vidbooster.com, 1 vide-dressing.org, 0 @@ -31280,7 +31279,7 @@ vorodevops.com, 1 vos-fleurs.ch, 1 vos-fleurs.com, 1 vosgym.jp, 1 -voshod.org, 0 +voshod.org, 1 vosky.fr, 1 vostronet.com, 1 voter-info.uk, 1 @@ -31503,6 +31502,7 @@ waterschaplimburg.nl, 1 watertrails.io, 1 waterworkscondos.com, 1 watsonwork.me, 1 +wattechweb.com, 1 wave-ola.es, 1 wavesboardshop.com, 1 wavesoftime.com, 1 @@ -31597,6 +31597,7 @@ webdesigneauclaire.com, 1 webdesignerinwarwickshire.co.uk, 1 webdesignplay.com, 1 webdesignplayground.io, 1 +webdesignssussex.co.uk, 1 webdev-quiz.de, 1 webdevops.io, 1 webdosh.com, 1 @@ -32741,7 +32742,6 @@ xn--vck8crc655y34ioha.net, 1 xn--vck8crcu789ajtaj92eura.xyz, 1 xn--w22a.jp, 1 xn--werner-schffer-fib.de, 1 -xn--wmq.jp, 0 xn--xz1a.jp, 1 xn--y8j148r.xn--q9jyb4c, 1 xn--y8j2eb5631a4qf5n0h.com, 1 @@ -33014,7 +33014,6 @@ yotilab.com, 1 yotilabs.com, 1 yotta-zetta.com, 1 yotubaiotona.net, 1 -youcaitian.com, 1 youcancraft.de, 1 youcanfuckoff.xyz, 1 youcanmakeit.at, 1 From 1c0199be67d95799087716b3723703d26f09d433 Mon Sep 17 00:00:00 2001 From: ffxbld Date: Wed, 20 Dec 2017 10:37:32 -0800 Subject: [PATCH 32/32] No bug, Automated HPKP preload list update from host bld-linux64-spot-302 - a=hpkp-update --- security/manager/ssl/StaticHPKPins.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/security/manager/ssl/StaticHPKPins.h b/security/manager/ssl/StaticHPKPins.h index 4908e2b91cc1..e7b834837c02 100644 --- a/security/manager/ssl/StaticHPKPins.h +++ b/security/manager/ssl/StaticHPKPins.h @@ -1159,4 +1159,4 @@ static const TransportSecurityPreload kPublicKeyPinningPreloadList[] = { static const int32_t kUnknownId = -1; -static const PRTime kPreloadPKPinsExpirationTime = INT64_C(1522175596241000); +static const PRTime kPreloadPKPinsExpirationTime = INT64_C(1522262045635000);