aboutsummaryrefslogtreecommitdiffstats
path: root/community/chromium/resolver.patch
diff options
context:
space:
mode:
Diffstat (limited to 'community/chromium/resolver.patch')
-rw-r--r--community/chromium/resolver.patch14
1 files changed, 3 insertions, 11 deletions
diff --git a/community/chromium/resolver.patch b/community/chromium/resolver.patch
index bcf32995cf..18974790fa 100644
--- a/community/chromium/resolver.patch
+++ b/community/chromium/resolver.patch
@@ -1,5 +1,3 @@
-diff --git a/net/dns/dns_reloader.cc b/net/dns/dns_reloader.cc
-index 03e248c..1a7b237 100644
--- ./net/dns/dns_reloader.cc
+++ ./net/dns/dns_reloader.cc
@@ -4,8 +4,7 @@
@@ -12,11 +10,9 @@ index 03e248c..1a7b237 100644
#include <resolv.h>
-diff --git a/net/dns/host_resolver_manager.cc b/net/dns/host_resolver_manager.cc
-index 3c75dde..c748d94 100644
--- ./net/dns/host_resolver_manager.cc
+++ ./net/dns/host_resolver_manager.cc
-@@ -2386,8 +2386,7 @@ HostResolverManager::HostResolverManager(const Options& options,
+@@ -2747,8 +2747,7 @@
NetworkChangeNotifier::AddConnectionTypeObserver(this);
if (system_dns_config_notifier_)
system_dns_config_notifier_->AddObserver(this);
@@ -26,11 +22,9 @@ index 3c75dde..c748d94 100644
EnsureDnsReloaderInit();
#endif
-diff --git a/net/dns/host_resolver_proc.cc b/net/dns/host_resolver_proc.cc
-index 90d9958..71d9b4a 100644
--- ./net/dns/host_resolver_proc.cc
+++ ./net/dns/host_resolver_proc.cc
-@@ -197,8 +197,7 @@ int SystemHostResolverCall(const std::string& host,
+@@ -159,8 +159,7 @@
base::ScopedBlockingCall scoped_blocking_call(FROM_HERE,
base::BlockingType::WILL_BLOCK);
@@ -39,6 +33,4 @@ index 90d9958..71d9b4a 100644
+#if defined(__GLIBC__)
DnsReloaderMaybeReload();
#endif
- int err = getaddrinfo(host.c_str(), nullptr, &hints, &ai);
---- ./net/dns/host_resolver_manager.cc.orig
-+++ ./net/dns/host_resolver_manager.cc
+ base::Optional<AddressInfo> ai;