diff options
| author | sf <sf@13f79535-47bb-0310-9956-ffa450edef68> | 2012-05-28 13:05:08 +0000 |
|---|---|---|
| committer | sf <sf@13f79535-47bb-0310-9956-ffa450edef68> | 2012-05-28 13:05:08 +0000 |
| commit | 2ff29c08e310337c8f06af9f25ba1fddbb4a74d6 (patch) | |
| tree | 02ecd0fc2deadfea60802a4130d93fe9a5b609b3 /network_io | |
| parent | 1e48fc01d7fe5a462ef1be89e729442577fb687e (diff) | |
| download | libapr-2ff29c08e310337c8f06af9f25ba1fddbb4a74d6.tar.gz | |
Merge r1341196:
If we retry getaddrinfo() without AI_ADDRCONFIG, we should really only remove
AI_ADDRCONFIG and not all flags.
When the retry logic was added in r64571, this was equivalent because not
other flags were set. But this has changed since then.
git-svn-id: http://svn.apache.org/repos/asf/apr/apr/branches/1.5.x@1343234 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'network_io')
| -rw-r--r-- | network_io/unix/sockaddr.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/network_io/unix/sockaddr.c b/network_io/unix/sockaddr.c index ed4c474dc..89053f007 100644 --- a/network_io/unix/sockaddr.c +++ b/network_io/unix/sockaddr.c @@ -357,8 +357,8 @@ static apr_status_t call_resolver(apr_sockaddr_t **sa, error = getaddrinfo(hostname, servname, &hints, &ai_list); #ifdef HAVE_GAI_ADDRCONFIG if (error == EAI_BADFLAGS && family == APR_UNSPEC) { - /* Retry with no flags if AI_ADDRCONFIG was rejected. */ - hints.ai_flags = 0; + /* Retry without AI_ADDRCONFIG if it was rejected. */ + hints.ai_flags &= ~AI_ADDRCONFIG; error = getaddrinfo(hostname, servname, &hints, &ai_list); } #endif |