Added --enable-ipv6 and only look up AAAA in DNS when enabled

diff --git a/configure.in b/configure.in
index 129fdfeb2c758cffb96c5169fda714b2a435bb5f..da232b0caa202835f98258c31fa52a0ff9699a39 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -410,9 +410,6 @@ AC_CACHE_CHECK([for IPv6 support], ac_cv_ipv6_support,
 #include <sys/socket.h>
 #include <netinet/in.h>], [struct sockaddr_in6 s; struct in6_addr t=in6addr_any; int i=AF_INET6; s; t.s6_addr[0] = 0;],
   [ac_cv_ipv6_support=yes], [ac_cv_ipv6_support=no])])
-if test "$ac_cv_ipv6_support" = yes; then
-  AC_DEFINE(HAVE_IPV6,1,[Whether you have IPv6 support])
-fi
 
 
 
@@ -692,6 +689,13 @@ if test "$PHP_DMALLOC" = "yes"; then
   ])
 fi
 
+PHP_ARG_ENABLE(ipv6,whether to enable IPv6 support,
+[  --enable-ipv6           Enable IPv6 support],yes)
+
+if test "$PHP_IPV6" != "no" && test "$ac_cv_ipv6_support" = yes; then
+  AC_DEFINE(HAVE_IPV6,1,[Whether to enable IPv6 support])
+fi
+
 AC_CHECK_LIB(crypt, crypt, [
   PHP_ADD_LIBRARY(crypt)
   PHP_ADD_LIBRARY(crypt, 1)

diff --git a/main/network.c b/main/network.c
index a4bd9b4e4271def597011ce88abfb6ee94512fb8..3fe7e9a152dd8217b390170c7ac06566b9cb59dc 100644 (file)
--- a/main/network.c
+++ b/main/network.c
@@ -157,7 +157,11 @@ static int php_network_getaddresses(const char *host, struct sockaddr ***sal)
                struct addrinfo hints, *res, *sai;
 
                memset(&hints, '\0', sizeof(hints));
+#  ifdef HAVE_IPV6
                hints.ai_family = AF_UNSPEC;
+#  else
+               hints.ai_family = AF_INET;
+#  endif
                if ((n = getaddrinfo(host, NULL, &hints, &res))) {
                        php_error(E_WARNING, "php_network_getaddresses: getaddrinfo failed: %s", PHP_GAI_STRERROR(n));
                        return 0;