Backed out changeset cbceb4f4ec73 (bug 1245059) because something from this push appears to have broken Windows mochitests CLOSED TREE
authorWes Kocher <wkocher@mozilla.com>
Fri, 18 Mar 2016 15:47:28 -0700
changeset 289429 e0b052f1f5cdd907904f19c41803cefc0fea64c4
parent 289428 bb4d8c21d7d17fba93c4a16ca92f13a970a2bace
child 289430 58dc7aaefa9cd7427dbb775767938fe2dc32a295
push id30102
push userryanvm@gmail.com
push dateSat, 19 Mar 2016 15:23:17 +0000
treeherdermozilla-central@720fb3d55e28 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1245059
milestone48.0a1
backs outcbceb4f4ec73a560ade80ff920229621c2851104
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Backed out changeset cbceb4f4ec73 (bug 1245059) because something from this push appears to have broken Windows mochitests CLOSED TREE MozReview-Commit-ID: 5dPzH9ZhTrn
modules/libpref/init/all.js
netwerk/system/win32/nsNotifyAddrListener.cpp
netwerk/system/win32/nsNotifyAddrListener.h
--- a/modules/libpref/init/all.js
+++ b/modules/libpref/init/all.js
@@ -1225,23 +1225,16 @@ pref("security.fileuri.strict_origin_pol
 // telemetry is also enabled as otherwise there is no way to report
 // the results
 pref("network.allow-experiments", true);
 
 // Allow the network changed event to get sent when a network topology or
 // setup change is noticed while running.
 pref("network.notify.changed", true);
 
-// Allow network detection of IPv6 related changes (bug 1245059)
-#if defined(XP_WIN)
-pref("network.notify.IPv6", false);
-else
-pref("network.notify.IPv6", true);
-#endif
-
 // Transmit UDP busy-work to the LAN when anticipating low latency
 // network reads and on wifi to mitigate 802.11 Power Save Polling delays
 pref("network.tickle-wifi.enabled", false);
 pref("network.tickle-wifi.duration", 400);
 pref("network.tickle-wifi.delay", 16);
 
 // Turn off interprocess security checks. Needed to run xpcshell tests.
 pref("network.disable.ipc.security", false);
--- a/netwerk/system/win32/nsNotifyAddrListener.cpp
+++ b/netwerk/system/win32/nsNotifyAddrListener.cpp
@@ -41,17 +41,16 @@ static LazyLogModule gNotifyAddrLog("nsN
 static HMODULE sNetshell;
 static decltype(NcFreeNetconProperties)* sNcFreeNetconProperties;
 
 static HMODULE sIphlpapi;
 static decltype(NotifyIpInterfaceChange)* sNotifyIpInterfaceChange;
 static decltype(CancelMibChangeNotify2)* sCancelMibChangeNotify2;
 
 #define NETWORK_NOTIFY_CHANGED_PREF "network.notify.changed"
-#define NETWORK_NOTIFY_IPV6_PREF "network.notify.IPv6"
 
 // period during which to absorb subsequent network change events, in
 // milliseconds
 static const unsigned int kNetworkChangeCoalescingPeriod  = 1000;
 
 static void InitIphlpapi(void)
 {
     if (!sIphlpapi) {
@@ -102,17 +101,16 @@ NS_IMPL_ISUPPORTS(nsNotifyAddrListener,
 nsNotifyAddrListener::nsNotifyAddrListener()
     : mLinkUp(true)  // assume true by default
     , mStatusKnown(false)
     , mCheckAttempted(false)
     , mCheckEvent(nullptr)
     , mShutdown(false)
     , mIPInterfaceChecksum(0)
     , mAllowChangedEvent(true)
-    , mIPv6Changes(false)
     , mCoalescingActive(false)
 {
     InitIphlpapi();
 }
 
 nsNotifyAddrListener::~nsNotifyAddrListener()
 {
     NS_ASSERTION(!mThread, "nsNotifyAddrListener thread shutdown failed");
@@ -177,17 +175,17 @@ NS_IMETHODIMP
 nsNotifyAddrListener::Run()
 {
     PR_SetCurrentThreadName("Link Monitor");
 
     mStartTime = TimeStamp::Now();
 
     DWORD waitTime = INFINITE;
 
-    if (!sNotifyIpInterfaceChange || !sCancelMibChangeNotify2 || !mIPv6Changes) {
+    if (!sNotifyIpInterfaceChange || !sCancelMibChangeNotify2) {
         // For Windows versions which are older than Vista which lack
         // NotifyIpInterfaceChange. Note this means no IPv6 support.
         HANDLE ev = CreateEvent(nullptr, FALSE, FALSE, nullptr);
         NS_ENSURE_TRUE(ev, NS_ERROR_OUT_OF_MEMORY);
 
         HANDLE handles[2] = { ev, mCheckEvent };
         OVERLAPPED overlapped = { 0 };
         bool shuttingDown = false;
@@ -261,18 +259,16 @@ nsNotifyAddrListener::Init(void)
         return NS_ERROR_FAILURE;
 
     nsresult rv = observerService->AddObserver(this, "xpcom-shutdown-threads",
                                                false);
     NS_ENSURE_SUCCESS(rv, rv);
 
     Preferences::AddBoolVarCache(&mAllowChangedEvent,
                                  NETWORK_NOTIFY_CHANGED_PREF, true);
-    Preferences::AddBoolVarCache(&mIPv6Changes,
-                                 NETWORK_NOTIFY_IPV6_PREF, false);
 
     mCheckEvent = CreateEvent(nullptr, FALSE, FALSE, nullptr);
     NS_ENSURE_TRUE(mCheckEvent, NS_ERROR_OUT_OF_MEMORY);
 
     rv = NS_NewThread(getter_AddRefs(mThread), this);
     NS_ENSURE_SUCCESS(rv, rv);
 
     return NS_OK;
--- a/netwerk/system/win32/nsNotifyAddrListener.h
+++ b/netwerk/system/win32/nsNotifyAddrListener.h
@@ -77,19 +77,16 @@ private:
     ULONG mIPInterfaceChecksum;
 
     // start time of the checking
     mozilla::TimeStamp mStartTime;
 
     // Network changed events are enabled
     bool mAllowChangedEvent;
 
-    // Check for IPv6 network changes
-    bool mIPv6Changes;
-
     // Flag set while coalescing change events
     bool mCoalescingActive;
 
     // Time stamp for first event during coalescing
     mozilla::TimeStamp mChangeTime;
 };
 
 #endif /* NSNOTIFYADDRLISTENER_H_ */