blob: 736b520a18958ab56a282e1e3783f2a81efb37a9 (
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
|
--- chromium-13.0.754.0.orig/net/base/dnsrr_resolver.cc
+++ chromium-13.0.754.0/net/base/dnsrr_resolver.cc
@@ -185,16 +185,20 @@
}
bool r = true;
+#if defined(OS_POSIX) && !defined(__UCLIBC__)
if ((_res.options & RES_INIT) == 0) {
if (res_ninit(&_res) != 0)
r = false;
}
+#else
+ r = true;
+#endif
if (r) {
unsigned long saved_options = _res.options;
r = Do();
-#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_OPENBSD)
+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_OPENBSD) && !defined(__UCLIBC__)
if (!r && DnsReloadTimerHasExpired()) {
// When there's no network connection, _res may not be initialized by
// getaddrinfo. Therefore, we call res_nclose only when there are ns
--- chromium-13.0.754.0.orig/net/base/host_resolver_proc.cc
+++ chromium-13.0.754.0/net/base/host_resolver_proc.cc
@@ -198,7 +198,7 @@
int err = getaddrinfo(host.c_str(), NULL, &hints, &ai);
bool should_retry = false;
-#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_OPENBSD)
+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_OPENBSD) && !defined(__UCLIBC__)
// If we fail, re-initialise the resolver just in case there have been any
// changes to /etc/resolv.conf and retry. See http://crbug.com/11380 for info.
if (err && DnsReloadTimerHasExpired()) {
|
