Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docs/root/api/starting_envoy.rst
Original file line number Diff line number Diff line change
Expand Up @@ -392,7 +392,7 @@ on supported platforms (iOS 12+) to update the preferred Envoy network cluster (
``enableHappyEyeballs``
~~~~~~~~~~~~~~~~~~~~~~~

Specify whether to use Happy Eyeballs when multiple IP stacks may be supported.
Specify whether to use Happy Eyeballs when multiple IP stacks may be supported. Defaults to true.

**Example**::

Expand Down
1 change: 1 addition & 0 deletions docs/root/intro/version_history.rst
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ Pending Release
Breaking changes:

- api: replace the `drainConnections()` method with a broader `resetConnectivityState()`. (:issue:`#2225 <2225>`).
- net: enable happy eyeballs by default (:issue:`#2272 <2272>`)

Bugfixes:

Expand Down
4 changes: 2 additions & 2 deletions library/common/config/config.cc
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,9 @@ const std::string config_header = R"(
- &dns_fail_base_interval 2s
- &dns_fail_max_interval 10s
- &dns_query_timeout 25s
- &dns_lookup_family V4_PREFERRED
- &dns_lookup_family ALL
- &dns_min_refresh_rate 60s
- &dns_multiple_addresses false
- &dns_multiple_addresses true
- &dns_preresolve_hostnames []
- &dns_refresh_rate 60s
- &dns_resolver_name envoy.network.dns_resolver.cares
Expand Down
5 changes: 3 additions & 2 deletions library/kotlin/io/envoyproxy/envoymobile/EngineBuilder.kt
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ open class EngineBuilder(
private var dnsPreresolveHostnames = "[]"
private var enableDrainPostDnsRefresh = false
private var enableHttp3 = false
private var enableHappyEyeballs = false
private var enableHappyEyeballs = true
private var enableInterfaceBinding = false
private var h2ConnectionKeepaliveIdleIntervalMilliseconds = 1
private var h2ConnectionKeepaliveTimeoutSeconds = 10
Expand Down Expand Up @@ -231,7 +231,8 @@ open class EngineBuilder(
}

/**
* Specify whether to use Happy Eyeballs when multiple IP stacks may be supported.
* Specify whether to use Happy Eyeballs when multiple IP stacks may be supported. Defaults to
* true.
*
* @param enableHappyEyeballs whether to enable RFC 6555 handling for IPv4/IPv6.
*
Expand Down
5 changes: 3 additions & 2 deletions library/swift/EngineBuilder.swift
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ open class EngineBuilder: NSObject {
private var dnsMinRefreshSeconds: UInt32 = 60
private var dnsPreresolveHostnames: String = "[]"
private var dnsRefreshSeconds: UInt32 = 60
private var enableHappyEyeballs: Bool = false
private var enableHappyEyeballs: Bool = true
private var enableInterfaceBinding: Bool = false
private var enforceTrustChainVerification: Bool = true
private var enableDrainPostDnsRefresh: Bool = false
Expand Down Expand Up @@ -154,7 +154,8 @@ open class EngineBuilder: NSObject {
return self
}

/// Specify whether to use Happy Eyeballs when multiple IP stacks may be supported.
/// Specify whether to use Happy Eyeballs when multiple IP stacks may be supported. Defaults to
/// true.
///
/// - parameter enableHappyEyeballs: whether to enable RFC 6555 handling for IPv4/IPv6.
///
Expand Down
1 change: 0 additions & 1 deletion test/kotlin/apps/experimental/MainActivity.kt
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,6 @@ class MainActivity : Activity() {
.addPlatformFilter(::DemoFilter)
.addPlatformFilter(::BufferDemoFilter)
.addPlatformFilter(::AsyncDemoFilter)
.enableHappyEyeballs(true)
.h2ExtendKeepaliveTimeout(true)
.enableInterfaceBinding(true)
.addNativeFilter("envoy.filters.http.buffer", "{\"@type\":\"type.googleapis.com/envoy.extensions.filters.http.buffer.v3.Buffer\",\"max_request_bytes\":5242880}")
Expand Down
1 change: 0 additions & 1 deletion test/swift/apps/experimental/ViewController.swift
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ final class ViewController: UITableViewController {
.addPlatformFilter(DemoFilter.init)
.addPlatformFilter(BufferDemoFilter.init)
.addPlatformFilter(AsyncDemoFilter.init)
.enableHappyEyeballs(true)
.h2ExtendKeepaliveTimeout(true)
.enableInterfaceBinding(true)
// swiftlint:disable:next line_length
Expand Down