| Index: net/base/host_resolver_proc.cc
|
| ===================================================================
|
| --- net/base/host_resolver_proc.cc (revision 70147)
|
| +++ net/base/host_resolver_proc.cc (working copy)
|
| @@ -196,9 +196,14 @@
|
| // Restrict result set to only this socket type to avoid duplicates.
|
| hints.ai_socktype = SOCK_STREAM;
|
|
|
| +#if WATCH_RESOLV_CONF
|
| + if (ResolvConfUpdated())
|
| + res_ninit(&_res);
|
| +#endif
|
| +
|
| + bool should_retry = false;
|
| int err = getaddrinfo(host.c_str(), NULL, &hints, &ai);
|
| - bool should_retry = false;
|
| -#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_OPENBSD)
|
| +#if WATCH_RESOLV_CONF
|
| // 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()) {
|
|
|