blob: e98e0e5e8eb0ef52663622486f497196ae61e0c3 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
|
--- ./net/dns/dns_reloader.cc
+++ ./net/dns/dns_reloader.cc
@@ -4,8 +4,7 @@
#include "net/dns/dns_reloader.h"
-#if defined(OS_POSIX) && !defined(OS_APPLE) && !defined(OS_OPENBSD) && \
- !defined(OS_ANDROID) && !defined(OS_FUCHSIA)
+#if defined(__GLIBC__)
#include <resolv.h>
--- ./net/dns/host_resolver_manager.cc
+++ ./net/dns/host_resolver_manager.cc
@@ -2779,8 +2779,7 @@
NetworkChangeNotifier::AddConnectionTypeObserver(this);
if (system_dns_config_notifier_)
system_dns_config_notifier_->AddObserver(this);
-#if defined(OS_POSIX) && !defined(OS_APPLE) && !defined(OS_OPENBSD) && \
- !defined(OS_ANDROID)
+#if defined(__GLIBC__)
EnsureDnsReloaderInit();
#endif
--- ./net/dns/host_resolver_proc.cc
+++ ./net/dns/host_resolver_proc.cc
@@ -159,8 +159,7 @@
base::ScopedBlockingCall scoped_blocking_call(FROM_HERE,
base::BlockingType::WILL_BLOCK);
-#if defined(OS_POSIX) && !defined(OS_APPLE) && !defined(OS_OPENBSD) && \
- !defined(OS_ANDROID) && !defined(OS_FUCHSIA)
+#if defined(__GLIBC__)
DnsReloaderMaybeReload();
#endif
base::Optional<AddressInfo> ai;
--- ./net/dns/dns_config_service_linux.cc.orig
+++ ./net/dns/dns_config_service_linux.cc
@@ -486,20 +480,11 @@
std::unique_ptr<struct __res_state>
DnsConfigServiceLinux::ResolvReader::GetResState() {
- auto res = std::make_unique<struct __res_state>();
- memset(res.get(), 0, sizeof(struct __res_state));
-
- if (res_ninit(res.get()) != 0) {
- CloseResState(res.get());
- return nullptr;
- }
-
- return res;
+ return nullptr;
}
void DnsConfigServiceLinux::ResolvReader::CloseResState(
struct __res_state* res) {
- res_nclose(res);
}
DnsConfigServiceLinux::DnsConfigServiceLinux()
|
