diff options
author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-06-25 10:22:19 +0200 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-06-25 10:22:20 +0200 |
commit | bd20b30bf8fad9ca5e407a331a0e1d25a67b382b (patch) | |
tree | d6af84c82b5a4aba2024b18d21d5f75a341f2ecd /src/network | |
parent | c2c90b95bf8304e69a5f0a586c607105cc104f83 (diff) | |
parent | 7a4dcbaabf037a6913a5662ebb74cc47e04673b9 (diff) |
Merge remote-tracking branch 'origin/stable' into 5.3
Change-Id: I7462840d15583ead82e86fcf5c84659b909e8c4e
Diffstat (limited to 'src/network')
-rw-r--r-- | src/network/kernel/qdnslookup_unix.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/network/kernel/qdnslookup_unix.cpp b/src/network/kernel/qdnslookup_unix.cpp index 108fcbaf60..8c5a0ebdba 100644 --- a/src/network/kernel/qdnslookup_unix.cpp +++ b/src/network/kernel/qdnslookup_unix.cpp @@ -160,9 +160,11 @@ void QDnsLookupRunnable::query(const int requestType, const QByteArray &requestN Q_CHECK_PTR(ns); state._u._ext.nsaddrs[0] = ns; } +#ifndef __UCLIBC__ // Set nsmap[] to indicate that nsaddrs[0] is an IPv6 address // See: https://sourceware.org/ml/libc-hacker/2002-05/msg00035.html state._u._ext.nsmap[0] = MAXNS + 1; +#endif state._u._ext.nscount6 = 1; ns->sin6_family = AF_INET6; ns->sin6_port = htons(53); |