Bug 1420777 - Coalesce connections less aggresively r=necko-reviewers…

…,kershaw

Differential Revision: https://phabricator.services.mozilla.com/D204663

UltraBlame original commit: 83ed667f93bb974d4a366f3ef977266940e30df2

modules/libpref/init/StaticPrefList.yaml

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

netwerk/protocol/http/ConnectionEntry.h

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