Backed out changeset 83ed667f93bb (bug 1420777) for causing xpcshell …

…failures test_connection_coalescing.js.

UltraBlame original commit: d3695ab206c646188b8b1930286d5bfbefa94ffe

modules/libpref/init/StaticPrefList.yaml

@@ -78469,99 +78469,6 @@ true
 mirror
 :
 always
-#
-When
-true
-origin
-A
-and
-origin
-B
-will
-be
-coalesced
-if
-they
-have
-an
-overlap
-#
-in
-IP
-addresses
-as
-advertized
-by
-DNS
-regardless
-if
-the
-existing
-connection
-#
-to
-origin
-A
-is
-not
-to
-an
-IP
-present
-in
-B
-'
-s
-DNS
-response
-.
-#
-When
-false
-an
-existing
-connection
-will
-only
-be
-reused
-if
-the
-#
-connection
-'
-s
-remote
-IP
-is
-also
-present
-in
-B
-'
-s
-DNS
-response
-.
--
-name
-:
-network
-.
-http
-.
-http2
-.
-aggressive_coalescing
-type
-:
-RelaxedAtomicBool
-value
-:
-false
-mirror
-:
-always
 -
 name
 :

netwerk/protocol/http/ConnectionEntry.cpp

@@ -673,12 +673,6 @@ Clear
 (
 )
 ;
-mAddresses
-.
-Clear
-(
-)
-;
 }
 void
 ConnectionEntry
@@ -735,12 +729,6 @@ Clear
 (
 )
 ;
-mAddresses
-.
-Clear
-(
-)
-;
 }
 void
 ConnectionEntry
@@ -2369,12 +2357,6 @@ Clear
 (
 )
 ;
-mAddresses
-.
-Clear
-(
-)
-;
 }
 uint32_t
 ConnectionEntry
@@ -5463,6 +5445,12 @@ return
 false
 ;
 }
+nsTArray
+<
+NetAddr
+>
+addressSet
+;
 nsresult
 rv
 =
@@ -5471,7 +5459,7 @@ dnsRecord
 >
 GetAddresses
 (
-mAddresses
+addressSet
 )
 ;
 if
@@ -5482,7 +5470,7 @@ rv
 )
 |
 |
-mAddresses
+addressSet
 .
 IsEmpty
 (
@@ -5502,7 +5490,7 @@ i
 ;
 i
 <
-mAddresses
+addressSet
 .
 Length
 (
@@ -5516,7 +5504,7 @@ i
 if
 (
 (
-mAddresses
+addressSet
 [
 i
 ]
@@ -5529,7 +5517,7 @@ family
 AF_INET
 &
 &
-mAddresses
+addressSet
 [
 i
 ]
@@ -5544,7 +5532,7 @@ ip
 |
 |
 (
-mAddresses
+addressSet
 [
 i
 ]
@@ -5557,7 +5545,7 @@ family
 AF_INET6
 &
 &
-mAddresses
+addressSet
 [
 i
 ]
@@ -5575,7 +5563,7 @@ u64
 0
 &
 &
-mAddresses
+addressSet
 [
 i
 ]
@@ -5650,7 +5638,7 @@ kIPv6CStrBufSize
 26
 )
 ;
-mAddresses
+addressSet
 [
 i
 ]

netwerk/protocol/http/ConnectionEntry.h

@@ -472,12 +472,6 @@ nsCString
 >
 mCoalescingKeys
 ;
-nsTArray
-<
-NetAddr
->
-mAddresses
-;
 bool
 mUsingSpdy
 :