From a500255598f96944d8b0aa693aa4d0da4b99f9e0 Mon Sep 17 00:00:00 2001
From: csagan5 <32685696+csagan5@users.noreply.github.com>
Date: Sat, 11 Jan 2020 17:11:14 +0100
Subject: [PATCH] Release 79.0.3945.123

---
 CHANGELOG.md                                  |  5 +-
 build/bromite_patches_list.txt                |  1 +
 .../Use-a-minimum-DoH-timeout-of-400ms.patch  | 49 +++++++++++++++++++
 build/patches/User-Agent-anonymize.patch      |  2 +-
 4 files changed, 55 insertions(+), 2 deletions(-)
 create mode 100644 build/patches/Use-a-minimum-DoH-timeout-of-400ms.patch

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f38ac5a6..5a045bb8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,9 +1,12 @@
+# 79.0.3945.123
+* updated User-agent version
+* increase minimum DoH timeout to 400ms (fixes https://github.com/bromite/bromite/issues/437)
+
 # 79.0.3945.111
 * automatically disable video decoding acceleration on Android 10+ and arm64
 * restore enable-horizontal-tab-switcher flag
 * remove non-working contextual search settings
 * disable QUIC by default
-* fix DoH timeouts issue (https://github.com/bromite/bromite/issues/437)
 * remove logging for DoH timeouts
 
 # 79.0.3945.107
diff --git a/build/bromite_patches_list.txt b/build/bromite_patches_list.txt
index 497ed187..8dfcee88 100644
--- a/build/bromite_patches_list.txt
+++ b/build/bromite_patches_list.txt
@@ -142,3 +142,4 @@ Always-show-site-settings-for-cookies-javascript-and-ads.patch
 Automated-domain-substitution.patch
 Do-not-enable-QUIC-by-default.patch
 Restore-enable-horizontal-tab-switcher-flag.patch
+Use-a-minimum-DoH-timeout-of-400ms.patch
diff --git a/build/patches/Use-a-minimum-DoH-timeout-of-400ms.patch b/build/patches/Use-a-minimum-DoH-timeout-of-400ms.patch
new file mode 100644
index 00000000..c44e03bc
--- /dev/null
+++ b/build/patches/Use-a-minimum-DoH-timeout-of-400ms.patch
@@ -0,0 +1,49 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Thu, 9 Jan 2020 19:59:08 +0100
+Subject: Use a minimum DoH timeout of 400ms
+
+---
+ net/dns/dns_session.cc | 7 ++++++-
+ net/dns/dns_session.h  | 1 +
+ 2 files changed, 7 insertions(+), 1 deletion(-)
+
+diff --git a/net/dns/dns_session.cc b/net/dns/dns_session.cc
+--- a/net/dns/dns_session.cc
++++ b/net/dns/dns_session.cc
+@@ -118,6 +118,8 @@ DnsSession::DnsSession(const DnsConfig& config,
+   socket_pool_->Initialize(&config_.nameservers, net_log);
+   UMA_HISTOGRAM_CUSTOM_COUNTS("AsyncDNS.ServerCount",
+                               config_.nameservers.size(), 1, 10, 11);
++  // minimum timeout for all DoH requests
++  min_doh_timeout_ = base::TimeDelta::FromMilliseconds(400);
+   UpdateTimeouts(NetworkChangeNotifier::GetConnectionType());
+   InitializeServerStats();
+ }
+@@ -325,9 +327,12 @@ base::TimeDelta DnsSession::NextTimeout(unsigned server_index, int attempt) {
+ }
+ 
+ base::TimeDelta DnsSession::NextDohTimeout(unsigned doh_server_index) {
+-  return NextTimeoutHelper(
++  base::TimeDelta timeout = NextTimeoutHelper(
+       GetServerStats(doh_server_index, true /* is _doh_server */),
+       0 /* num_backoffs */);
++  if (timeout < min_doh_timeout_)
++     return min_doh_timeout_;
++  return timeout;
+ }
+ 
+ base::TimeDelta DnsSession::NextTimeoutHelper(ServerStats* server_stats,
+diff --git a/net/dns/dns_session.h b/net/dns/dns_session.h
+--- a/net/dns/dns_session.h
++++ b/net/dns/dns_session.h
+@@ -167,6 +167,7 @@ class NET_EXPORT_PRIVATE DnsSession : public base::RefCounted<DnsSession> {
+ 
+   base::TimeDelta initial_timeout_;
+   base::TimeDelta max_timeout_;
++  base::TimeDelta min_doh_timeout_;
+ 
+   // Track runtime statistics of each insecure DNS server.
+   std::vector<std::unique_ptr<ServerStats>> server_stats_;
+-- 
+2.17.1
+
diff --git a/build/patches/User-Agent-anonymize.patch b/build/patches/User-Agent-anonymize.patch
index 641bb8e6..074e9557 100644
--- a/build/patches/User-Agent-anonymize.patch
+++ b/build/patches/User-Agent-anonymize.patch
@@ -18,7 +18,7 @@ diff --git a/components/version_info/version_info.cc b/components/version_info/v
  std::string GetProductNameAndVersionForUserAgent() {
 -  return "Chrome/" + GetVersionNumber();
 +  // latest stable version
-+  return "Chrome/79.0.3945.93";
++  return "Chrome/79.0.3945.116";
  }
  
  std::string GetProductName() {