Merge release to beta. CLOSED TREE

2015-05-01 20:15:58 -04:00
parent c311adddf6 0feeadb17f
commit 995fa21986
20 changed files with 199 additions and 393 deletions
--- a/browser/base/content/test/chat/browser_chatwindow.js
+++ b/browser/base/content/test/chat/browser_chatwindow.js
@@ -6,30 +6,6 @@ Components.utils.import("resource://gre/modules/Promise.jsm", this);

 let chatbar = document.getElementById("pinnedchats");

-function waitForCondition(condition, errorMsg) {
-  let deferred = Promise.defer();
-  var tries = 0;
-  var interval = setInterval(function() {
-    if (tries >= 30) {
-      ok(false, errorMsg);
-      moveOn();
-    }
-    var conditionPassed;
-    try {
-      conditionPassed = condition();
-    } catch (e) {
-      ok(false, e + "\n" + e.stack);
-      conditionPassed = false;
-    }
-    if (conditionPassed) {
-      moveOn();
-    }
-    tries++;
-  }, 100);
-  var moveOn = function() { clearInterval(interval); deferred.resolve(); };
-  return deferred.promise;
-}
-
 add_chat_task(function* testOpenCloseChat() {
  let chatbox = yield promiseOpenChat("http://example.com");
  Assert.strictEqual(chatbox, chatbar.selectedChat);
@@ -115,7 +91,7 @@ add_chat_task(function* testSecondTopLevelWindow() {
  secondWindow.close();
 });

-// Test that chats are created in the correct window.
+// Test that findChromeWindowForChats() returns the expected window.
 add_chat_task(function* testChatWindowChooser() {
  let chat = yield promiseOpenChat("http://example.com");
  Assert.equal(numChatsInWindow(window), 1, "first window has the chat");
@@ -124,42 +100,34 @@ add_chat_task(function* testChatWindowChooser() {
  let secondWindow = OpenBrowserWindow();
  yield promiseOneEvent(secondWindow, "load");
  Assert.equal(secondWindow, Chat.findChromeWindowForChats(null), "Second window is the preferred chat window");
-  Assert.equal(numChatsInWindow(secondWindow), 0, "second window starts with no chats");
-  yield promiseOpenChat("http://example.com#2");
-  Assert.equal(numChatsInWindow(secondWindow), 1, "second window now has chats");
-  Assert.equal(numChatsInWindow(window), 1, "first window still has 1 chat");
-  chat.close();

-  // a bit heavy handed, but handy fixing bug 1090633
-  yield waitForCondition(function () !chat.parentNode, "chat has been detached");
-  Assert.equal(numChatsInWindow(window), 0, "first window now has no chats");
-  // now open another chat - it should still open in the second.
-  yield promiseOpenChat("http://example.com#3");
-  Assert.equal(numChatsInWindow(window), 0, "first window still has no chats");
-  Assert.equal(numChatsInWindow(secondWindow), 2, "second window has both chats");
+  // focus the first window, and check it will be selected for future chats.
+  // Bug 1090633 - there are lots of issues around focus, especially when the
+  // browser itself doesn't have focus. We can end up with
+  // Services.wm.getMostRecentWindow("navigator:browser") returning a different
+  // window than, say, Services.focus.activeWindow. But the focus manager isn't
+  // the point of this test.
+  // So we simply keep focusing the first window until it is reported as the
+  // most recent.
+  do {
+    dump("trying to force window to become the most recent.\n");
+    secondWindow.focus();
+    window.focus();
+    yield promiseWaitForFocus();
+  } while (Services.wm.getMostRecentWindow("navigator:browser") != window)

-  // focus the first window, and open yet another chat - it
-  // should open in the first window.
-  window.focus();
-  yield promiseWaitForFocus();
-  chat = yield promiseOpenChat("http://example.com#4");
-  Assert.equal(numChatsInWindow(window), 1, "first window got new chat");
-  chat.close();
-  Assert.equal(numChatsInWindow(window), 0, "first window has no chats");
+  Assert.equal(window, Chat.findChromeWindowForChats(null), "First window now the preferred chat window");

  let privateWindow = OpenBrowserWindow({private: true});
  yield promiseOneEvent(privateWindow, "load")

-  // open a last chat - the focused window can't accept
-  // chats (it's a private window), so the chat should open
-  // in the window that was selected before. This is known
-  // to be broken on Linux.
-  chat = yield promiseOpenChat("http://example.com#5");
-  let os = Services.appinfo.OS;
-  const BROKEN_WM_Z_ORDER = os != "WINNT" && os != "Darwin";
-  let fn = BROKEN_WM_Z_ORDER ? todo : ok;
-  fn(numChatsInWindow(window) == 1, "first window got the chat");
-  chat.close();
+  // The focused window can't accept chats (it's a private window), so the
+  // chat should open in the window that was selected before. This will be
+  // either window or secondWindow (linux may choose a different one) but the
+  // point is that the window is *not* the private one.
+  Assert.ok(Chat.findChromeWindowForChats(null) == window ||
+            Chat.findChromeWindowForChats(null) == secondWindow,
+            "Private window isn't selected for new chats.");
  privateWindow.close();
  secondWindow.close();
 });
--- a/browser/base/content/test/chat/browser_focus.js
+++ b/browser/base/content/test/chat/browser_focus.js
@@ -10,12 +10,16 @@ const CHAT_URL = "https://example.com/browser/browser/base/content/test/chat/cha
 // Is the currently opened tab focused?
 function isTabFocused() {
  let tabb = gBrowser.getBrowserForTab(gBrowser.selectedTab);
-  return Services.focus.focusedWindow == tabb.contentWindow;
+  // focus sucks in tests - our window may have lost focus.
+  let elt = Services.focus.getFocusedElementForWindow(window, false, {});
+  return elt == tabb;
 }

 // Is the specified chat focused?
 function isChatFocused(chat) {
-  return chat.chatbar._isChatFocused(chat);
+  // focus sucks in tests - our window may have lost focus.
+  let elt = Services.focus.getFocusedElementForWindow(window, false, {});
+  return elt == chat.content;
 }

 let chatbar = document.getElementById("pinnedchats");
--- a/configure.in
+++ b/configure.in
@@ -6599,7 +6599,7 @@ if test -n "$gonkdir"; then
 fi

 case "$OS_TARGET:$NIGHTLY_BUILD" in
-WINNT:*)
+WINNT:1)
    MOZ_CONTENT_SANDBOX=$MOZ_SANDBOX
    ;;
 Darwin:1)
--- a/dom/media/eme/MediaKeySystemAccess.cpp
+++ b/dom/media/eme/MediaKeySystemAccess.cpp
@@ -13,6 +13,7 @@
 #endif
 #ifdef XP_WIN
 #include "mozilla/WindowsVersion.h"
+#include "WMFDecoderModule.h"
 #endif
 #include "nsContentCID.h"
 #include "nsServiceManagerUtils.h"
@@ -21,6 +22,7 @@
 #include "mozilla/Services.h"
 #include "nsIObserverService.h"
 #include "mozilla/EMEUtils.h"
+#include "GMPUtils.h"

 namespace mozilla {
 namespace dom {
@@ -155,6 +157,13 @@ MediaKeySystemAccess::GetKeySystemStatus(const nsAString& aKeySystem,
    if (!Preferences::GetBool("media.gmp-eme-adobe.enabled", false)) {
      return MediaKeySystemStatus::Cdm_disabled;
    }
+    if ((!WMFDecoderModule::HasH264() || !WMFDecoderModule::HasAAC()) ||
+        !EMEVoucherFileExists()) {
+      // The system doesn't have the codecs that Adobe EME relies
+      // on installed, or doesn't have a voucher for the plugin-container.
+      // Adobe EME isn't going to work, so don't advertise that it will.
+      return MediaKeySystemStatus::Cdm_not_supported;
+    }
    if (!HaveGMPFor(mps,
                    NS_ConvertUTF16toUTF8(aKeySystem),
                    NS_LITERAL_CSTRING(GMP_API_DECRYPTOR)) &&
--- a/dom/media/gmp/GMPProcessParent.cpp
+++ b/dom/media/gmp/GMPProcessParent.cpp
@@ -5,8 +5,7 @@
 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */

 #include "GMPProcessParent.h"
-#include "nsDirectoryServiceDefs.h"
-#include "nsIFile.h"
+#include "GMPUtils.h"

 #include "base/string_util.h"
 #include "base/process_util.h"
@@ -45,15 +44,13 @@ GMPProcessParent::~GMPProcessParent()
 bool
 GMPProcessParent::Launch(int32_t aTimeoutMs)
 {
-  nsCOMPtr<nsIFile> greDir;
-  NS_GetSpecialDirectory(NS_GRE_DIR, getter_AddRefs(greDir));
-  if (!greDir) {
-    NS_WARNING("GMPProcessParent can't get NS_GRE_DIR");
+  nsCOMPtr<nsIFile> path;
+  if (!GetEMEVoucherPath(getter_AddRefs(path))) {
+    NS_WARNING("GMPProcessParent can't get EME voucher path!");
    return false;
  }
-  greDir->AppendNative(NS_LITERAL_CSTRING("voucher.bin"));
  nsAutoCString voucherPath;
-  greDir->GetNativePath(voucherPath);
+  path->GetNativePath(voucherPath);

  vector<string> args;
  args.push_back(mGMPPath);
--- a/dom/media/gmp/GMPUtils.cpp
+++ b/dom/media/gmp/GMPUtils.cpp
@@ -0,0 +1,38 @@
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim: set ts=8 sts=2 et sw=2 tw=80: */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#include "GMPUtils.h"
+#include "nsDirectoryServiceDefs.h"
+#include "nsIFile.h"
+#include "nsCOMPtr.h"
+
+namespace mozilla {
+
+bool
+GetEMEVoucherPath(nsIFile** aPath)
+{
+  nsCOMPtr<nsIFile> path;
+  NS_GetSpecialDirectory(NS_GRE_DIR, getter_AddRefs(path));
+  if (!path) {
+    NS_WARNING("GetEMEVoucherPath can't get NS_GRE_DIR!");
+    return false;
+  }
+  path->AppendNative(NS_LITERAL_CSTRING("voucher.bin"));
+  path.forget(aPath);
+  return true;
+}
+
+bool
+EMEVoucherFileExists()
+{
+  nsCOMPtr<nsIFile> path;
+  bool exists;
+  return GetEMEVoucherPath(getter_AddRefs(path)) &&
+         NS_SUCCEEDED(path->Exists(&exists)) &&
+         exists;
+}
+
+} // namespace mozilla
--- a/dom/media/gmp/GMPUtils.h
+++ b/dom/media/gmp/GMPUtils.h
@@ -11,7 +11,7 @@
 namespace mozilla {

 template<typename T>
-struct DestroyPolicy
+struct GMPUniqueDestroyPolicy
 {
  void operator()(T* aGMPObject) const {
    aGMPObject->Destroy();
@@ -21,9 +21,13 @@ struct DestroyPolicy
 // Ideally, this would be a template alias, but GCC 4.6 doesn't support them.  See bug 1124021.
 template<typename T>
 struct GMPUnique {
-  typedef mozilla::UniquePtr<T, DestroyPolicy<T>> Ptr;
+  typedef mozilla::UniquePtr<T, GMPUniqueDestroyPolicy<T>> Ptr;
 };

+bool GetEMEVoucherPath(nsIFile** aPath);
+
+bool EMEVoucherFileExists();
+
 } // namespace mozilla

 #endif
--- a/dom/media/gmp/moz.build
+++ b/dom/media/gmp/moz.build
@@ -89,6 +89,7 @@ UNIFIED_SOURCES += [
    'GMPStorageParent.cpp',
    'GMPTimerChild.cpp',
    'GMPTimerParent.cpp',
+    'GMPUtils.cpp',
    'GMPVideoDecoderChild.cpp',
    'GMPVideoDecoderParent.cpp',
    'GMPVideoEncodedFrameImpl.cpp',
--- a/dom/media/tests/mochitest/mochitest.ini
+++ b/dom/media/tests/mochitest/mochitest.ini
@@ -88,7 +88,7 @@ skip-if = buildapp == 'b2g' || toolkit == 'android' || e10s
 # frequent timeouts/crashes on e10s (bug 1048455)
 skip-if = buildapp == 'b2g' || toolkit == 'android' || e10s
 [test_peerConnection_basicH264Video.html]
-skip-if = buildapp == 'b2g' || os == 'android' || os == 'win' # bug 1043403, bug 1146061 (win)
+skip-if = buildapp == 'b2g' || os == 'android' # bug 1043403
 [test_peerConnection_bug822674.html]
 skip-if = toolkit == 'gonk' # b2g (Bug 1059867)
 [test_peerConnection_bug825703.html]
--- a/dom/tests/mochitest/bugs/mochitest.ini
+++ b/dom/tests/mochitest/bugs/mochitest.ini
@@ -54,7 +54,6 @@ skip-if = (buildapp == 'b2g' && (toolkit != 'gonk' || debug))
 [test_bug342448.html]
 [test_bug345521.html]
 [test_bug346659.html]
-skip-if = (buildapp == 'b2g' && toolkit != 'gonk') #Bug 931116, b2g desktop specific, initial triage
 [test_bug351601.html]
 [test_bug369306.html]
 skip-if = buildapp == 'mulet' || (buildapp == 'b2g' && (toolkit != 'gonk' || debug)) || toolkit == 'android' || e10s #TIMED_OUT # b2g-debug(test timed out, can't focus back from popup window to opener?) b2g-desktop(test timed out, can't focus back from popup window to opener?)
--- a/dom/tests/mochitest/bugs/test_bug346659.html
+++ b/dom/tests/mochitest/bugs/test_bug346659.html
@@ -18,12 +18,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=346659
 <script type="application/javascript">

 /** Test for Bug 346659 **/
-// do the tests in two batches, because otherwise the popup blocker kills off
-// our test because it opens too many windows.
-var numTestsSet1 = 6;
-var numTestsSet2 = 2;
-var numTestsSet3 = 2;
-var complete = 0;
+var numTests = 10;
 SimpleTest.waitForExplicitFinish();

 var wins = [];
@@ -134,22 +129,7 @@ function messageReceiver(evt) {
 }

 function handleTestEnd() {
-  function gc() {
-    SpecialPowers.DOMWindowUtils.garbageCollect();
-  }
-  if (numTestsSet1) {
-    if (!--numTestsSet1) {
-      // gc to get rid of all the old windows
-      gc(); gc(); gc();
-      setTimeout(startSecondBatch, 0);
-    }
-  } else if (numTestsSet2) {
-    if (!--numTestsSet2) {
-      // gc to get rid of all the old windows
-      gc(); gc(); gc();
-      setTimeout(startThirdBatch, 0);
-    }
-  } else if (!--numTestsSet3) {
+  if (!--numTests) {
    SimpleTest.finish();
  }
 }
@@ -170,17 +150,12 @@ wins[6] = window.open('bug346659-parent.html?{"write":6}');

 is(location.host, "mochi.test:8888", "Unexpected host");

-function startSecondBatch() {
-  var baseurl = window.location.href.replace(/mochi\.test:8888/, "example.com");
-  wins[7] = window.open(r(baseurl, 'bug346659-opener.html?{"load":7}'));
-  wins[9] = window.open(r(baseurl, 'bug346659-parent.html?{"load":9}'));
-}
+var baseurl = window.location.href.replace(/mochi\.test:8888/, "example.com");
+wins[7] = window.open(r(baseurl, 'bug346659-opener.html?{"load":7}'));
+wins[9] = window.open(r(baseurl, 'bug346659-parent.html?{"load":9}'));

-function startThirdBatch() {
-  var baseurl = window.location.href.replace(/mochi\.test:8888/, "example.com");
-  wins[11] = window.open(r(baseurl, 'bug346659-opener.html?{"load":11,"xsite":true}'));
-  wins[12] = window.open(r(baseurl, 'bug346659-parent.html?{"load":12,"xsite":true}'));
-}
+wins[11] = window.open(r(baseurl, 'bug346659-opener.html?{"load":11,"xsite":true}'));
+wins[12] = window.open(r(baseurl, 'bug346659-parent.html?{"load":12,"xsite":true}'));
 </script>
 </pre>
 </body>
--- a/gfx/layers/d3d11/CompositorD3D11.cpp
+++ b/gfx/layers/d3d11/CompositorD3D11.cpp
@@ -1049,7 +1049,7 @@ CompositorD3D11::BeginFrame(const nsIntRegion& aInvalidRegion,
  // this is important because resizing our buffers when mimised will fail and
  // cause a crash when we're restored.
  NS_ASSERTION(mHwnd, "Couldn't find an HWND when initialising?");
-  if (::IsIconic(mHwnd) || gfxPlatform::GetPlatform()->DidRenderingDeviceReset()) {
+  if (::IsIconic(mHwnd) || mDevice->GetDeviceRemovedReason() != S_OK) {
    *aRenderBoundsOut = Rect();
    return;
  }
@@ -1122,6 +1122,10 @@ CompositorD3D11::BeginFrame(const nsIntRegion& aInvalidRegion,
 void
 CompositorD3D11::EndFrame()
 {
+  if (!mDefaultRT) {
+    return;
+  }
+
  mContext->Flush();

  nsIntSize oldSize = mSize;
@@ -1262,6 +1266,13 @@ CompositorD3D11::UpdateRenderTarget()
  nsRefPtr<ID3D11Texture2D> backBuf;

  hr = mSwapChain->GetBuffer(0, __uuidof(ID3D11Texture2D), (void**)backBuf.StartAssignment());
+  if (hr == DXGI_ERROR_INVALID_CALL) {
+    // This happens on some GPUs/drivers when there's a TDR.
+    if (mDevice->GetDeviceRemovedReason() != S_OK) {
+      gfxCriticalError() << "GetBuffer returned invalid call!";
+      return;
+    }
+  }
  if (Failed(hr)) {
    return;
  }
--- a/mobile/android/base/gfx/GLController.java
+++ b/mobile/android/base/gfx/GLController.java
@@ -5,6 +5,7 @@

 package org.mozilla.gecko.gfx;

+import org.mozilla.gecko.AppConstants;
 import org.mozilla.gecko.GeckoAppShell;
 import org.mozilla.gecko.GeckoEvent;
 import org.mozilla.gecko.GeckoThread;
@@ -112,8 +113,12 @@ public class GLController {
    };

    private GLController() {
-        mEGLPreloadingThread = new EGLPreloadingThread();
-        mEGLPreloadingThread.start();
+        if (AppConstants.Versions.preICS) {
+            mEGLPreloadingThread = new EGLPreloadingThread();
+            mEGLPreloadingThread.start();
+        } else {
+            mEGLPreloadingThread = null;
+        }
    }

    static GLController getInstance(LayerView view) {
@@ -211,10 +216,12 @@ public class GLController {
        // it shouldn't be a problem to be initializing EGL from two different threads.
        // Still, having this join() here means that we don't have to wonder about what
        // kind of caveats might exist with EGL initialization reentrancy on various drivers.
-        try {
-            mEGLPreloadingThread.join();
-        } catch (InterruptedException e) {
-            Log.w(LOGTAG, "EGLPreloadingThread interrupted", e);
+        if (mEGLPreloadingThread != null) {
+            try {
+                mEGLPreloadingThread.join();
+            } catch (InterruptedException e) {
+                Log.w(LOGTAG, "EGLPreloadingThread interrupted", e);
+            }
        }

        mEGL = (EGL10)EGLContext.getEGL();
@@ -225,18 +232,20 @@ public class GLController {
            return;
        }

-        // while calling eglInitialize here should not be necessary as it was already called
-        // by the EGLPreloadingThread, it really doesn't cost much to call it again here,
-        // and makes this code easier to think about: EGLPreloadingThread is only a
-        // preloading optimization, not something we rely on for anything else.
-        //
-        // Also note that while calling eglInitialize isn't necessary on Android 4.x
-        // (at least Android's HardwareRenderer does it for us already), it is necessary
-        // on Android 2.x.
-        int[] returnedVersion = new int[2];
-        if (!mEGL.eglInitialize(mEGLDisplay, returnedVersion)) {
-            Log.w(LOGTAG, "eglInitialize failed");
-            return;
+        if (AppConstants.Versions.preICS) {
+            // while calling eglInitialize here should not be necessary as it was already called
+            // by the EGLPreloadingThread, it really doesn't cost much to call it again here,
+            // and makes this code easier to think about: EGLPreloadingThread is only a
+            // preloading optimization, not something we rely on for anything else.
+            //
+            // Also note that while calling eglInitialize isn't necessary on Android 4.x
+            // (at least Android's HardwareRenderer does it for us already), it is necessary
+            // on Android 2.x.
+            int[] returnedVersion = new int[2];
+            if (!mEGL.eglInitialize(mEGLDisplay, returnedVersion)) {
+                Log.w(LOGTAG, "eglInitialize failed");
+                return;
+            }
        }

        mEGLConfig = chooseConfig();
--- a/security/manager/ssl/src/IntolerantFallbackList.inc
+++ b/security/manager/ssl/src/IntolerantFallbackList.inc
@@ -9,7 +9,6 @@

 static const char* const kIntolerantFallbackList[] =
 {
-  "23andme.com", // bug 1136376
  "a127-jobs.nyc.gov", // bug 1134709
  "aa.com", // bug 1141604
  "aa.com.br", // bug 1141604
@@ -18,15 +17,16 @@ static const char* const kIntolerantFallbackList[] =
  "aa.com.ve", // bug 1141604
  "aacoprod.aacounty.org",
  "aavacations.com", // bug 1141604
+  "accesd.desjardins.com", // bug 1148465
+  "access.boekhuis.nl", // bug 1151580
  "access.uwstout.edu",
  "account.61.com.tw",
  "acs.sia.eu", // RC4
  "actiononline.stpete.org",
-  "ad401k.sbisec.co.jp",
  "adman.you.gr",
  "adminweb.uthscsa.edu",
-  "affiliatewalla.com",
  "airportwifi.com", // bug 1116891
+  "allbankonline.in", // bug 1156441
  "allyours.virginmedia.com", // bug 1129887
  "altitude.aircanada.com", // bug 1143325
  "american-airlines.co.kr", // bug 1141604
@@ -46,7 +46,6 @@ static const char* const kIntolerantFallbackList[] =
  "americanairlines.ie", // bug 1141604
  "americanairlines.in", // bug 1141604
  "americanairlines.jp", // bug 1141604
-  "americanscreeningcorp.com",
  "amss.mobilicity.ca",
  "ap.meitetsuunyu.co.jp",
  "appgraffiti.com",
@@ -56,327 +55,240 @@ static const char* const kIntolerantFallbackList[] =
  "apps.sasken.com",
  "apps.state.or.us", // bug 1130472
  "appsrv.restat.com",
-  "arts.ac.uk",
  "ascii.jp",
-  "asiaenglish.visitkorea.or.kr",
  "asiointi.hel.fi",
-  "asknow.com",
+  "asko.fi", // bug 1158584
  "b2b.feib.com.tw",
-  "bcccbookstore.bccc.edu",
-  "bedrijfsprofiel.graydon.nl",
  "beehive.miit.ru",
  "bettertrades.com",
+  "bgw.wangyin.com", // bug 1145521
  "bianmin.chinapay.com", // bug 1137983
-  "big5chinese.visitkorea.or.kr",
  "bigflix.com",
-  "billingcp.us", // bug 1144639
  "blackboard.tru.ca",
  "blastam.com",
  "blogwatcher.co.jp",
-  "blueportal.vanmarcke.be",
-  "boldchat.com",
  "bonds.euronext.com", // bug 1136091
  "books.wwnorton.com", // bug 1116891
-  "bookstore.alma.edu",
-  "bookstore.assumption.edu",
-  "bookstore.bsc.edu",
-  "bookstore.calbaptist.edu",
-  "bookstore.doane.edu",
-  "bookstore.drury.edu",
-  "bookstore.grinnell.edu",
-  "bookstore.hacc.edu",
-  "bookstore.hancockcollege.edu",
-  "bookstore.icc.edu",
-  "bookstore.northern.edu",
-  "bookstore.ntc.edu",
-  "bookstore.palmer.edu",
-  "bookstore.phcc.edu",
-  "bookstore.reed.edu",
-  "bookstore.smc.edu",
-  "bookstore.snu.edu",
-  "bookstore.sunyjefferson.edu",
-  "bookstore.tridenttech.edu",
-  "bookstore.wbu.edu",
-  "bookstore.wscc.edu",
-  "brocksperformance.com",
+  "bredbandsbolaget.se", // bug 1158755
  "bursar.ou.edu",
  "buttons.verticalresponse.com",
  "c2g.jupiter.fl.us",
  "cache.bankleumi.co.il", // bug 1138142
  "canadaca.geotrust.com", // bug 1137677
-  "cardupgrade.citi.com", // bug 1144726
-  "cart.pcpitstop.com", // bug 1116891
-  "cbsfilms.epk.tv",
+  "card-data.com", // bug 1154285
+  "cas.rutgers.edu", // bug 1152465
  "cbsfnotes1.blood.org.tw",
-  "central.acadiau.ca",
+  "central.acadiau.ca", // bug 1152377
+  "cgdonline.cgd.fr", // bug 1154716
  "cherry.de", // bug 1141521
-  "chinese.visitkorea.or.kr",
-  "click2gov.alpharetta.ga.us",
+  "civilization.com", // bug 1156004
  "click2gov.sanangelotexas.us",
  "clientes.chilectra.cl",
  "club.guosen.com.cn",
  "coagov.aurora-il.org",
  "codem.codemasters.com",
-  "collegestore.hfcc.edu",
+  "compteasso.service-public.fr", // bug 1144058
+  "comptepro.service-public.fr", // bug 1144058
  "comune.milano.it",
+  "connexion.mon.service-public.fr", // bug 1144058
  "consumer-prod.prescriptionsolutions.com", // bug 1141933
-  "corporate.webfg.com",
  "corporbank.nbcb.com.cn",
-  "coursecatalog.harvard.edu",
  "create.skyword.com", // bug 1141580
-  "creatroninc.com", // bug 1143178
  "crm.et2008.com",
  "crossroads.schneider.com",
  "crypticstudios.com",
  "cs.tokai-tv.com",
  "cualerts.dupaco.com", // bug 1116892
+  "customers.logistafrance.fr", // bug 1153951
  "cwu.edu",
  "dbank.hxb.com.cn",
  "dealer.autobytel.com",
  "dealer.autoc-one.jp",
+  "desjardins.com", // bug 1148465
  "developer.fsmoffice.net",
-  "developer.palm.com", // bug 1135561
  "dheb.delavska-hranilnica.si",
  "digibet.com",
+  "digitalsecurity.intel.com", // bug 1148744
  "dinsmore.fsmoffice.net",
-  "direct-teleshop.jp",
-  "direct.graydon.nl",
-  "domains4less.co.nz", // bug 1139784
  "dream-prize.com",
  "dwwsyw.bjgjj.gov.cn",
-  "e-mediador.fiatc.es",
-  "e-profesional.fiatc.es",
-  "eagleslanding.lamission.edu",
-  "earthy.com",
  "eatm.scsb.com.tw",
  "eb.bankcomm.com.hk", // bug 1141742
  "ebank-public.hzbank.com.cn",
-  "ebank.accessbankplc.com",
+  "ebank.db-pbc.pl", // bug 1146281
  "ebank.hxb.com.cn",
  "ebank.hzbank.com.cn",
+  "ebank.rcbcy.com", // bug 1146755
  "ebanking.ocbcwhhk.com", // bug 1141746
  "ebill2.virginmedia.com", // bug 1129887
  "ebpp.airtel.lk",
+  "ebspay.boc.cn", // bug 1155567
  "ec-line.cn",
  "echo.com",
  "echotrak.com",
  "ecom.morethangourmet.com",
  "ecourses.uthscsa.edu",
  "egov.leaguecity.com",
+  "egov.town-menasha.com", // bug 1157536
  "emaildvla.direct.gov.uk", // bug 1116891
  "embroiderydesignsplus.com",
-  "english.visitkorea.or.kr",
  "epicreg.com",
-  "epk.tv",
-  "epolicija.lt",
  "eremit.sbising.com",
  "escrowrefills.com",
  "eservices.palomar.edu",
  "essentialsupplies.com",
  "etimebanker.bankofthewest.com", // bug 1127204
  "event.kasite.net",
-  "extra.ytk.fi",
  "extranet.eurocontrol.int",
  "ez.cityofchesapeake.net",
  "ezpay.com.tw",
  "fallback.test", // Used by gtest
  "fastlane.echo.com",
-  "fhbonline.fhb.com",
  "fhsaa.org",
  "finance.car.com",
  "followupfactory.fsmoffice.net",
-  "fonts.com",
-  "french.visitkorea.or.kr",
  "friends.freshandeasy.com",
  "fsmoffice.net",
  "ftisystem.fsmoffice.net",
  "fubar.com",
-  "gardeningdirect.co.uk",
  "gateway.halton.gov.uk",
  "gbe-bund.de",
  "geico.com", // bug 1138613
-  "german.visitkorea.or.kr",
  "gestionesytramites.madrid.org",
  "giftcertificates.com",
-  "gosignmeup.com", // bug 1116891
-  "gotimeforce.com",
-  "grammarbook.com",
  "hb.posted.co.rs",
  "hb2.bankleumi.co.il", // bug 1138142
  "hercle.com",
-  "hikkoshi.homes.co.jp",
-  "home.hi-ho.ne.jp",
-  "hoosierlottery.com",
-  "household.endsleigh.co.uk",
  "hpshop.gr",
-  "hr.templehealth.org",
-  "hypotheek.bankofscotland.nl",
  "ibusiness.shacombank.com.hk", // bug 1141989
  "identity.virginmedia.com", // bug 1129887
-  "iezukuri.homes.co.jp",
  "ifueltech.fsmoffice.net",
  "ifund.allianzglobalinvestors.com.tw",
  "ihr.suburbanpropane.com",
-  "iiaba.net",
  "images.bankofthewest.com", // bug 1127204
-  "inboxtech.co.za", // bug 1140919
-  "inquire.homes.co.jp",
  "inside.i-med.ac.at",
  "its.bocmacau.com",
  "ividmail.fsmoffice.net",
-  "japanese.visitkorea.or.kr",
-  "jeansrestaurantsupply.com",
+  "jbclick.jaxbchfl.net", // bug 1158465
  "jifenpay.com",
  "jodunning.com",
-  "jookey.jp",
+  "jst.doded.mil", // bug 1152627
  "juror.fairfaxcounty.gov",
-  "kaigo.homes.co.jp",
  "keirin.jp",
-  "kfeducation.com",
  "kjp.keinet.ne.jp",
  "kjp.oo.kawai-juku.ac.jp",
  "kmis.brookes.ac.uk",
-  "kodate.homes.co.jp",
-  "korea.neways.com",
-  "korean.visitkorea.or.kr",
  "learn.ou.edu",
  "learn.swosu.edu",
  "leatherfads.com",
  "lewisham.gov.uk",
  "liaison.mon.service-public.fr", // bug 1144058
-  "library.indigo.ca",
  "lm-order.de",
-  "login.alibaba.com", // bug 1143375
  "login.chicagopolice.org",
  "login.ermis.gov.gr",
-  "lsc.okb.co.jp",
  "m.cacu.com",
  "m.e-hon.ne.jp",
  "m.optumrx.com", // bug 1141933
  "m.prescriptionsolutions.com", // bug 1141933
  "maakoalifestyle.fsmoffice.net",
  "mail.izhnet.ru",
-  "mailoffer.merrickbank.com",
  "map.infonavit.org.mx",
  "marketday.com", // bug 1092998
-  "mccbookstore.mchenry.edu",
  "mchrono.com",
-  "mechanicsb.com",
  "mecsumai.com",
  "member.edenredticket.com",
-  "members.caremanager.org",
-  "membres.fdj.fr",
+  "mercernet.fr", // bug 1147649
  "merchant.edenredticket.com",
-  "merrickbank.com",
  "meta-ehealth.com",
-  "mijn.graydon.nl",
-  "miportal.urjc.es",
  "mobile.aa.com", // bug 1141604
  "mobile.dream-prize.com",
  "mon-ulb.ulb.ac.be",
-  "mwed.jp",
+  "mon.service-public.fr", // bug 1144058
  "my-csprd.ea.cwu.edu", // bug 1143035
+  "my-csrenprd.ea.cwu.edu", // bug 1143035
  "my-fsprd.ea.cwu.edu", // bug 1143035
  "my-fsrenprd.ea.cwu.edu", // bug 1143035
  "my-fsrpt.ea.cwu.edu", // bug 1143035
  "my-hrprd.ea.cwu.edu", // bug 1143035
-  "my.arts.ac.uk",
-  "my.csmd.edu",
+  "my-hrrenprd.ea.cwu.edu", // bug 1143035
  "my.cwu.edu", // bug 1143035
  "my.kyivstar.ua",
  "my.miit.ru",
-  "my.mobilemone.com",
  "my.officef5.com",
  "my.rutgers.edu", // bug 1139065
  "myaccount.allstate.com", // bug 1143031
  "myaccount.teksavvy.com", // bug 1144646
+  "myaccount3.westnet.com.au", // bug 1157139
  "mybank.nbcb.com.cn",
-  "mybanner.gvsu.edu",
  "myhancock.hancockcollege.edu",
  "myntc.ntc.edu",
-  "mypage.homes.co.jp",
  "mysprint.sprint.com", // bug 1138211
  "myuws.uws.edu.au",
  "mywebreservations.com",
  "na.aiononline.com", // bug 1139782
  "national.virginmedia.com", // bug 1129887
  "nbank.hxb.com.cn",
-  "nbc.epk.tv",
-  "netbolsa.bpinet.pt", // bug 1132399
+  "netbanking.yesbank.co.in", // bug 1146090
  "niche.endsleigh.co.uk",
  "nmsmp.alsok.co.jp",
  "no1.nipponrentacar.co.jp",
  "obos1.obos.no",
  "officevp.fsmoffice.net",
  "officials.fhsaa.org",
-  "online.informs.org",
  "online.newindia.co.in",
  "online.sainsburysbank.co.uk",
+  "openwebosproject.org", // bug 1151990
  "opi.emersonclimate.com",
  "optumrx.com", // bug 1141933
  "opus.pinellascounty.org",
-  "orix-realestate.co.jp",
  "ow2.orderwave.com",
  "owa.byui.edu",
  "ozone.ou.edu",
  "parents.ou.edu",
-  "parionsweb.fr",
  "partnerweb.vmware.com", // bug 1142187
-  "pay3.chinabank.com.cn",
+  "paslists.com", // for port 9211, bug 1155712
+  "payment.condor.com", // bug 1152347
  "payment.safepass.cn",
  "payments.virginmedia.com", // bug 1129887
  "paymentshq.achfederal.com",
  "paypros.com",
-  "paysys.gooooal.com",
-  "peoples.com",
  "poezd.rw.by",
  "portal.eztec.com.br",
  "portal.questonline.gr",
  "portal.uem.es",
  "prescriptionsolutions.com", // bug 1141933
-  "pretzellogix.net", // bug 1139046
  "profiles.uthscsa.edu",
  "pryor.com",
-  "pts.club-g-po.jp",
+  "ps9-web1.cna.nl.ca", // bug 1159224
+  "psweb.ferrellgasathome.com", // bug 1152990
  "publicacionesoficiales.boe.es",
  "publicjobs.ie",
  "publicrecords.com",
  "quickbuy.qualitynet.net",
  "rakuraku-market.com",
-  "realestate.homes.co.jp",
  "recoup.com",
-  "recruit.nurse-senka.com",
-  "reform.homes.co.jp",
  "registration.o2.co.uk",
  "regonline.com", // bug 1139783
-  "reiseauskunft.bahn.de", // bug 1139706
-  "relativitymedia.epk.tv",
  "renewals.cipd.co.uk",
  "repair.kuroneko-kadendr.jp", // bug 1128366
  "repairmb.kuroneko-kadendr.jp", // bug 1128366
  "reputation.com",
  "research-report.uws.edu.au",
-  "reserve.opas.jp",
  "rezstream.net",
  "rietumu.lv",
  "rotr.com",
  "roxyaffiliates.com",
-  "russian.visitkorea.or.kr",
-  "s.aiasahi.jp",
  "sales.newchinalife.com",
  "sbank.hxb.com.cn",
  "sboseweb.mcpsweb.org",
  "school.keystoneschoolonline.com",
-  "schweser.com",
  "seaeagle.com",
  "secure-checkout.t-mobile.com", // bug 1133648
  "secure.bg-mania.jp",
  "secure.fortisbc.com",
-  "secure.leatherfads.com",
  "secure.medexpressrx.com",
  "secure.missouristate.edu",
  "secure.ncsoft.com", // bug 1139782
-  "secure.shoretrips.com",
  "secure.smartcart.com",
  "secure2.i-doxs.net", // bug 1140876
  "secure3.i-doxs.net", // bug 1140876
@@ -384,23 +296,17 @@ static const char* const kIntolerantFallbackList[] =
  "secure6.i-doxs.net", // bug 1140876
  "secure7.i-doxs.net", // bug 1140876
  "secure8.i-doxs.net", // bug 1140876
-  "securedcard.merrickbank.com",
  "secureonline.dwp.gov.uk",
  "sems.hrd.ccsd.net",
  "service.autoc-one.jp",
  "services.apvma.gov.au",
  "services.geotrust.com", // bug 1137677
  "servizionline.infogroup.it",
-  "shinchiku.homes.co.jp",
  "shop.autoc-one.jp",
  "shop.kagome.co.jp",
-  "shop.lococom.jp",
  "shop.maxim-ic.com",
  "shop.nanairo.coop", // bug 1128318
  "shop.wildstar-online.com", // bug 1139782
-  "shoplush.com",
-  "sigeduweb.udesa.edu.ar",
-  "signin.optimum.net", // bug 1138588
  "sirius.ws.ryukoku.ac.jp",
  "sisweb.ucd.ie",
  "slovanet.sk",
@@ -408,52 +314,35 @@ static const char* const kIntolerantFallbackList[] =
  "smarticon.geotrust.com", // bug 1137677
  "socialclub.rockstargames.com", // bug 1138673
  "soeasy.sodexo.be", // bug 1117157
-  "sony.epk.tv",
-  "spanish.visitkorea.or.kr",
  "ss2.sfcollege.edu",
  "ss5.sfcollege.edu",
+  "ssb.okbu.edu", // for port 8910, bug 1153749
  "ssl.safaribooksonline.com", // bug 1133940
+  "sso.acadiau.ca", // bug 1152377
  "sso.optumrx.com", // bug 1141933
-  "startrekonline.com",
  "stenhouse.com",
  "store.closetmaid.com",
-  "store.morningside.edu",
  "store.moxa.com",
-  "stub.com",
-  "stubpass.com",
  "sucf.suny.edu",
-  "sumai.homes.co.jp",
  "support.crypticstudios.com",
-  "support.ticketseating.com",
-  "support.ticketsupply.com",
  "svrch13.sugarlandtx.gov",
  "syzygy.co.uk",
  "tarjetacencosud.cl",
  "tele2.hr",
  "texashealth.org",
-  "thebookstore.tru.ca",
  "tianet.org",
-  "ticketseating.com",
-  "ticketsupply.com",
  "tienda.boe.es",
  "tiendas.mediamarkt.es",
-  "toushi.homes.co.jp",
  "trade.hsfund.com",
  "trueblue.jetblue.com",
-  "universal.epk.tv",
-  "upload.accudata.com",
+  "uralsg.megafon.ru", // bug 1153168
  "userdoor.com",
  "uslugi.beeline.am",
-  "uslugi.beeline.kz",
-  "utahbar.org", // bug 1127611
  "utradehub.or.kr",
-  "uxxiportal.upct.es",
-  "verkkokauppa.posti.fi",
  "vitalchoice.com",
  "vod.skyperfectv.co.jp",
  "watch.sportsnet.ca", // bug 1144769
  "web.asta.org",
-  "web3.secureinternetbank.com", // bug 1111354
  "webapps.ou.edu",
  "webatm.landbank.com.tw",
  "webmail.iyte.edu.tr",
@@ -461,10 +350,8 @@ static const char* const kIntolerantFallbackList[] =
  "websiti.cnbv.gob.mx",
  "webtv.tv2.no",
  "weddings.realresorts.com",
-  "westcoastcomputer.com",
  "whataburger.com",
  "wis.ntu.edu.sg",
-  "world-family.co.jp",
  "write.skyword.com", // bug 1141580
  "wszg.nbcs.gov.cn",
  "www.aa.co.uk", // bug 1141604
@@ -478,7 +365,7 @@ static const char* const kIntolerantFallbackList[] =
  "www.acgov.org",
  "www.acteonline.org",
  "www.aeroplan.com", // bug 1137543
-  "www.affiliatewalla.com",
+  "www.allbankonline.in", // bug 1156441
  "www.allinpay.com",
  "www.alphashirt.com",
  "www.american-airlines.co.kr", // bug 1141604
@@ -501,20 +388,14 @@ static const char* const kIntolerantFallbackList[] =
  "www.americanairlines.in", // bug 1141604
  "www.americanairlines.it", // bug 1141604
  "www.americanairlines.jp", // bug 1141604
-  "www.americanscreeningcorp.com",
  "www.amica.com", // bug 1139563
  "www.ancelutil.com.uy",
  "www.animate-onlineshop.jp", // bug 1126652
  "www.apeasternpower.com",
-  "www.apita.co.jp",
  "www.appgraffiti.com",
-  "www.applied.com",
-  "www.arts.ac.uk",
-  "www.ascap.com",
-  "www.asknow.com",
+  "www.asko.fi", // bug 1158584
  "www.auroragov.org",
  "www.bancocredichile.cl",
-  "www.bancofrances.com.ar",
  "www.bankcomm.com.hk", // bug 1141742
  "www.bankhapoalim.co.il", // bug 1138231
  "www.bankofthewest.com", // bug 1127204
@@ -522,43 +403,31 @@ static const char* const kIntolerantFallbackList[] =
  "www.bbsfonline.com",
  "www.bettertrades.com",
  "www.bigflix.com",
-  "www.billingcp.us", // bug 1144639
  "www.blastam.com",
  "www.blogwatcher.co.jp",
  "www.blueprintonline.co.za",
-  "www.bm-sms.co.jp",
  "www.bmfsfj.de",
  "www.boe.es",
-  "www.boldchat.com",
-  "www.bookstore.ccbcmd.edu",
-  "www.bookstore.csi.edu",
-  "www.bookstore.irsc.edu",
-  "www.bookstore.mtu.edu",
-  "www.bookstore.westga.edu",
  "www.boostmobilesales.com", // bug 1112178
  "www.borsaitaliana.it",
-  "www.botb.com",
  "www.bottegaverde.es",
  "www.bottegaverde.it",
  "www.bottegaverde.pt",
-  "www.bpionline.pt",
-  "www.brb.com.br",
-  "www.brocksperformance.com",
+  "www.bredbandsbolaget.se", // bug 1158755
  "www.bundespruefstelle.de",
  "www.businessdirect.bt.com",
  "www.cafedumonde.jp",
-  "www.care-mane.com",
+  "www.card-data.com", // bug 1154285
  "www.careers.asio.gov.au",
  "www.cherry.de", // bug 1141521
  "www.chinapay.com", // bug 1137983
  "www.cihi.ca",
  "www.cipd.co.uk",
+  "www.civilization.com", // bug 1156004
  "www.club-animate.jp",
  "www.cngcorp.com",
  "www.codan.dk",
-  "www.comune.milano.it",
  "www.contraloria.cl",
-  "www.creatroninc.com", // bug 1143178
  "www.credem.it",
  "www.crediscotia.com.mx",
  "www.creditagricole.info",
@@ -572,25 +441,19 @@ static const char* const kIntolerantFallbackList[] =
  "www.dabs4work.ie",
  "www.dakotacollectibles.com",
  "www.derayah.com",
+  "www.desjardins.com", // bug 1148465
  "www.digibet.com",
-  "www.domains4less.co.nz", // bug 1139784
  "www.drcsurveys.com",
  "www.dream-prize.com",
  "www.duskin.co.jp",
  "www.duskin.jp",
-  "www.earthy.com",
  "www.ec-line.cn",
  "www.echo.com",
  "www.echotrak.com",
-  "www.eckeroline.fi",
-  "www.econ.ne.jp",
  "www.embroiderydesignsplus.com",
  "www.emihub.com",
  "www.epicreg.com",
-  "www.epk.tv",
-  "www.epolicija.lt",
  "www.ermis.gov.gr",
-  "www.erneuerbare-energien.de",
  "www.esadealumni.net",
  "www.esavingsaccount.co.uk",
  "www.escrowrefills.com",
@@ -600,168 +463,114 @@ static const char* const kIntolerantFallbackList[] =
  "www.expogrupo.com",
  "www.ezpay.com.tw",
  "www.familien-wegweiser.de",
-  "www.fdj.fr",
  "www.fdms.gov", // bug 1137981
  "www.fhsaa.org",
-  "www.firsttothefinish.com",
  "www.fj96336.com",
-  "www.fn-neon.de",
-  "www.foerderdatenbank.de",
  "www.fontainebleau.com",
-  "www.fonts.com",
  "www.foundersc.com",
  "www.fsmoffice.net",
  "www.fubar.com",
  "www.fundsupermart.co.in",
  "www.gamers-onlineshop.jp", // bug 1126654
-  "www.gardeningdirect.co.uk",
  "www.gbe-bund.de",
  "www.giftcertificates.com",
  "www.golfersland.net",
-  "www.gosignmeup.com", // bug 1116891
-  "www.gotimeforce.com",
-  "www.grammarbook.com",
  "www.gtja.com",
  "www.hankyu-club.com",
  "www.haynes.co.uk",
  "www.hctmall.com.tw",
  "www.hercle.com",
-  "www.hitachi-ies.co.jp",
  "www.hn.10086.cn",
-  "www.hoosierlottery.com",
  "www.hotel-story.ne.jp",
  "www.hpshop.gr",
  "www.hsbank.cc",
  "www.hx168.com.cn",
  "www.icle.org",
-  "www.iezukuri-net.com",
-  "www.iiaba.net",
-  "www.inboxtech.co.za", // bug 1140919
  "www.ingramentertainment.com",
  "www.interpark.com",
  "www.jaf.or.jp",
-  "www.jeansrestaurantsupply.com",
  "www.jifenpay.com",
  "www.jodunning.com",
-  "www.kaigojob.com",
  "www.kasite.net",
-  "www.kfeducation.com",
  "www.khan.co.kr",
  "www.komatsu-kenki.co.jp",
  "www.komatsu.co.jp",
  "www.komatsu.com",
-  "www.kracie.co.jp",
  "www.kredodirect.com.ua", // bug 1095507
  "www.law888.com.tw",
-  "www.learndoj.gov",
  "www.leatherfads.com",
  "www.lewisham.gov.uk",
  "www.lib.cwu.edu",
  "www.libraryvideo.com",
-  "www.licadho-cambodia.org", // bug 1133312
  "www.lm-order.de",
-  "www.lococom.jp",
  "www.londonstockexchange.com",
-  "www.luckyscent.com",
-  "www.marenostrumresort.com",
  "www.marketday.com", // bug 1092998
  "www.matkahuolto.info",
  "www.matrics.or.jp",
  "www.mchrono.com",
-  "www.mechanicsb.com",
  "www.mecsumai.com",
  "www.mercatoneuno.com",
-  "www.merrickbank.com",
+  "www.mercernet.fr", // bug 1147649
  "www.meta-ehealth.com",
  "www.miracle-ear.com",
  "www.misterdonut.jp",
  "www.mizuno.jp",
-  "www.mizunoshop.net",
-  "www.monclick.fr",
  "www.monclick.it",
-  "www.mopera.net",
  "www.mp2.aeroport.fr",
  "www.mpay.co.th",
  "www.mtsindia.in", // RC4
-  "www.mwed.jp",
  "www.my.airdo.jp", // bug 1129773
+  "www.myagent.gov.ab.ca", // bug 1152827
  "www.mynpcdata.net",
  "www.mywebreservations.com",
  "www.ncsoft.com", // bug 1139782
  "www.nec-nexs.com",
-  "www.neways.com",
-  "www.newaysonline.com",
  "www.newchinalife.com",
  "www.nishi.or.jp",
-  "www.nursejinzaibank.com",
  "www.ocbcwhhk.com", // bug 1141746
-  "www.optimum.net", // bug 1138588
+  "www.openwebosproject.org", // bug 1151990
  "www.optumrx.com", // bug 1141933
  "www.optumrx.org", // bug 1141933
-  "www.orix-realestate.co.jp",
-  "www.orix-sumai.jp",
-  "www.ou.edu",
  "www.outlet01.com.tw",
-  "www.parionsweb.fr",
-  "www.partnerandaffinitycards.co.uk", // RC4
+  "www.paslists.com", // for port 9211, bug 1155712
  "www.paypros.com",
  "www.pen-kanagawa.ed.jp",
-  "www.peoples.com",
-  "www.play.net",
-  "www.point-tactix.jp",
  "www.polla.cl",
  "www.prescriptionsolutions.com", // bug 1141933
-  "www.pretzellogix.net", // bug 1139046
-  "www.priate.jp",
  "www.pryor.com",
  "www.publicjobs.ie",
  "www.publicrecords.com",
-  "www.purenurse.com",
  "www.pwcrecruiting.com",
  "www.razorgator.com",
  "www.recoup.com",
  "www.regonline.com", // bug 1139783
  "www.renaultcredit.com.ar",
  "www.reputation.com",
-  "www.rezservers.com",
  "www.rezstream.net",
  "www.rietumu.lv",
  "www.rimac.com.pe",
  "www.riversendtrading.com",
  "www.rotr.com",
  "www.roxyaffiliates.com",
-  "www.rubriquefidelite.com",
  "www.s-book.net",
  "www.safepass.cn",
-  "www.sandiegoimmunizationregistry.org",
-  "www.schweser.com",
  "www.seaeagle.com",
  "www.secure.missouristate.edu",
-  "www.sendwordnow.com",
  "www.session.ne.jp",
  "www.shacombank.com.hk", // bug 1141989
  "www.shacomsecurities.com.hk", // bug 1141989
-  "www.shadertoy.com", // bug 1137444
  "www.shanghaigm.com",
-  "www.shiki.jp",
-  "www.shinsei.e-aichi.jp",
  "www.shop.bt.com",
-  "www.shoplush.com",
  "www.sihd-bk.jp",
-  "www.sikatoru.com",
  "www.slovanet.sk",
  "www.smartcart.com",
  "www.smartoffice.jp",
  "www.soconngas.com",
  "www.sogehomebank.com",
-  "www.sogo-seibu.jp", // bug 1128602
  "www.sokamocka.com",
  "www.sports-nakama.com",
  "www.sprint.com", // bug 1138211
-  "www.startrekonline.com",
  "www.stenhouse.com",
-  "www.stub.com",
-  "www.stubpass.com",
  "www.sucf.suny.edu",
  "www.sunderland.gov.uk",
  "www.syzygy.co.uk",
@@ -773,53 +582,37 @@ static const char* const kIntolerantFallbackList[] =
  "www.texashealth.org",
  "www.thecopia.com",
  "www.tianet.org",
-  "www.ticketseating.com",
-  "www.ticketsupply.com",
-  "www.torrecatalunya.com",
-  "www.transunion.ca",
  "www.u-gakugei.ac.jp",
  "www.uccard.co.jp",
  "www.uinet.com",
-  "www.unodc.org",
  "www.ur-net.go.jp",
  "www.usairways.com", // bug 1142703
  "www.userdoor.com",
-  "www.utahbar.org", // bug 1127611
  "www.utradehub.or.kr",
  "www.virgin.net",
-  "www.visitkorea.or.kr",
  "www.vitalchoice.com",
  "www.wavecable.com",
  "www.websecurityguard.com",
-  "www.westcoastcomputer.com",
  "www.whataburger.com",
  "www.wingarc.com",
-  "www.witcc.edu",
-  "www.world-family.co.jp",
  "www.xm-l-tax.gov.cn",
  "www.yakult.co.kr",
-  "www.ymcacharlotte.org",
-  "www.yuuka.co.jp",
  "www.zenfolio.com",
  "www.zoominfo.com",
  "www1.aeroplan.com", // bug 1137543
  "www2.aeroplan.com", // bug 1137543
  "www2.bancobrasil.com.br", // bug 1135966
-  "www2.seibu.jp",
-  "www2.sogo-gogo.com",
  "www2.sysadm.suny.edu",
  "www2.wou.edu",
+  "www28.bb.com.br", // bug 1135966
  "www3.aeroplan.com", // bug 1137543
-  "www3.econ.ne.jp",
  "www3.ibac.co.jp",
  "www3.taiheiyo-ferry.co.jp",
  "www4.aeroplan.com", // bug 1137543
-  "www4.econ.ne.jp",
  "www41.bb.com.br", // bug 1135966
-  "www5.econ.ne.jp",
  "wwws.kadokawa.co.jp",
+  "xyk.cebbank.com", // bug 1145524
  "yeswellnesspro.fsmoffice.net",
-  "ymcacharlotte.org",
  "zenfolio.com",
  "zoominfo.com",
 };
--- a/testing/web-platform/meta/media-source/mediasource-duration.html.ini
+++ b/testing/web-platform/meta/media-source/mediasource-duration.html.ini
@@ -1,24 +1,13 @@
 [mediasource-duration.html]
  type: testharness
  [Test seek starts on duration truncation below currentTime]
-    expected:
-      if (os == "win") and (version != "5.1.2600"): PASS
-      if os == "mac": PASS
-      FAIL
+    disabled: https://bugzilla.mozilla.org/show_bug.cgi?id=1148224

  [Test appendBuffer completes previous seek to truncated duration]
-    disabled:
-      if (os == "win") and (version != "5.1.2600"): https://bugzilla.mozilla.org/show_bug.cgi?id=1148224
-    expected:
-      if os == "mac": PASS
-      FAIL
+    disabled: https://bugzilla.mozilla.org/show_bug.cgi?id=1148224

  [Test endOfStream completes previous seek to truncated duration]
-    disabled:
-      if (os == "win") and (version != "5.1.2600"): https://bugzilla.mozilla.org/show_bug.cgi?id=1148224
-    expected:
-      if os == "mac": PASS
-      FAIL
+    disabled: https://bugzilla.mozilla.org/show_bug.cgi?id=1148224

  [Test setting same duration multiple times does not fire duplicate durationchange]
    disabled:
--- a/toolkit/mozapps/extensions/internal/GMPProvider.jsm
+++ b/toolkit/mozapps/extensions/internal/GMPProvider.jsm
@@ -54,7 +54,7 @@ const GMP_PLUGINS = [
    name:            "eme-adobe_name",
    description:     "eme-adobe_description",
    licenseURL:      "http://help.adobe.com/en_US/primetime/drm/HTML5_CDM_EULA/index.html",
-    homepageURL:     "https://www.adobe.com/marketing-cloud/primetime-tv-platform.html",
+    homepageURL:     "http://help.adobe.com/en_US/primetime/drm/HTML5_CDM",
    optionsURL:      "chrome://mozapps/content/extensions/gmpPrefs.xul",
    isEME:           true
  }];
--- a/toolkit/mozapps/update/updater/updater.cpp
+++ b/toolkit/mozapps/update/updater/updater.cpp
@@ -797,7 +797,7 @@ static int ensure_copy_recursive(const NS_tchar *path, const NS_tchar *dest,
      }
    }
  }
-
+  NS_tclosedir(dir);
  return rv;
 }

--- a/widget/GfxDriverInfo.cpp
+++ b/widget/GfxDriverInfo.cpp
@@ -261,6 +261,9 @@ const GfxDeviceFamily* GfxDriverInfo::GetDeviceFamily(DeviceFamily id)
      APPEND_DEVICE(0x2e32);
      APPEND_DEVICE(0x2a02);
      break;
+    case Bug1155608:
+      APPEND_DEVICE(0x2e22); /* IntelG45_1 */
+      break;
    case AMDRadeonHD5800:
      APPEND_DEVICE(0x6899);
      break;
--- a/widget/GfxDriverInfo.h
+++ b/widget/GfxDriverInfo.h
@@ -89,6 +89,7 @@ enum DeviceFamily {
  AMDRadeonHD5800,
  Bug1137716,
  Bug1116812,
+  Bug1155608,
  DeviceFamilyMax
 };

--- a/widget/windows/GfxInfo.cpp
+++ b/widget/windows/GfxInfo.cpp
@@ -1103,6 +1103,11 @@ GfxInfo::GetGfxDriverInfo()
      nsIGfxInfo::FEATURE_DXVA, nsIGfxInfo::FEATURE_BLOCKED_DRIVER_VERSION,
      DRIVER_LESS_THAN, V(8,15,10,2622));

+    APPEND_TO_DRIVER_BLOCKLIST2(DRIVER_OS_WINDOWS_7,
+      (nsAString&)GfxDriverInfo::GetDeviceVendor(VendorIntel), (GfxDeviceFamily*)GfxDriverInfo::GetDeviceFamily(Bug1155608),
+      nsIGfxInfo::FEATURE_DXVA, nsIGfxInfo::FEATURE_BLOCKED_DRIVER_VERSION,
+      DRIVER_LESS_THAN_OR_EQUAL, V(8,15,10,2869));
+
    APPEND_TO_DRIVER_BLOCKLIST2(DRIVER_OS_ALL,
      (nsAString&)GfxDriverInfo::GetDeviceVendor(VendorNVIDIA), (GfxDeviceFamily*)GfxDriverInfo::GetDeviceFamily(Nvidia8800GTS),
      nsIGfxInfo::FEATURE_DXVA, nsIGfxInfo::FEATURE_BLOCKED_DRIVER_VERSION,