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.patch34
1 files changed, 17 insertions, 17 deletions
diff --git a/community/chromium/resolver.patch b/community/chromium/resolver.patch
index 7e2a0a4723..bde36ce1a5 100644
--- a/community/chromium/resolver.patch
+++ b/community/chromium/resolver.patch
@@ -1,27 +1,15 @@
--- ./net/dns/host_resolver_impl.cc.orig
+++ ./net/dns/host_resolver_impl.cc
-@@ -1881,8 +1881,7 @@
- #endif
+@@ -2039,8 +2039,7 @@
NetworkChangeNotifier::AddIPAddressObserver(this);
+ NetworkChangeNotifier::AddConnectionTypeObserver(this);
NetworkChangeNotifier::AddDNSObserver(this);
-#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_OPENBSD) && \
-- !defined(OS_ANDROID)
-+#if defined(__GLIBC__)
+- !defined(OS_ANDROID) && !defined(OS_FUCHSIA)
++#if defined(__GLIBC__)
EnsureDnsReloaderInit();
#endif
---- ./net/dns/host_resolver_proc.cc.orig
-+++ ./net/dns/host_resolver_proc.cc
-@@ -193,8 +193,7 @@
- // Restrict result set to only this socket type to avoid duplicates.
- hints.ai_socktype = SOCK_STREAM;
-
--#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_OPENBSD) && \
-- !defined(OS_ANDROID)
-+#if defined(__GLIBC__)
- DnsReloaderMaybeReload();
- #endif
- int err = getaddrinfo(host.c_str(), NULL, &hints, &ai);
--- ./net/dns/dns_reloader.cc.orig
+++ ./net/dns/dns_reloader.cc
@@ -4,8 +4,7 @@
@@ -29,8 +17,20 @@
#include "net/dns/dns_reloader.h"
-#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_OPENBSD) && \
-- !defined(OS_ANDROID)
+- !defined(OS_ANDROID) && !defined(OS_FUCHSIA)
+#if defined(__GLIBC__)
#include <resolv.h>
+--- ./net/dns/host_resolver_proc.cc.orig
++++ ./net/dns/host_resolver_proc.cc
+@@ -190,8 +190,7 @@
+ // Restrict result set to only this socket type to avoid duplicates.
+ hints.ai_socktype = SOCK_STREAM;
+
+-#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_OPENBSD) && \
+- !defined(OS_ANDROID) && !defined(OS_FUCHSIA)
++#if defined(__GLIBC__)
+ DnsReloaderMaybeReload();
+ #endif
+ int err = getaddrinfo(host.c_str(), NULL, &hints, &ai);