1
Description: Always use getaddrinfo
3
The patch should probably be dropped and the configure check verified.
6
Last-Update: 2010-01-18
10
@@ -615,50 +615,50 @@ PHP_CHECK_FUNC_LIB(nanosleep, rt)
12
dnl Check for getaddrinfo, should be a better way, but...
13
dnl Also check for working getaddrinfo
14
-AC_CACHE_CHECK([for getaddrinfo], ac_cv_func_getaddrinfo,
15
-[AC_TRY_LINK([#include <netdb.h>],
16
- [struct addrinfo *g,h;g=&h;getaddrinfo("","",g,&g);],
19
-#include <sys/types.h>
21
-# include <sys/socket.h>
24
- struct addrinfo *ai, *pai, hints;
26
- memset(&hints, 0, sizeof(hints));
27
- hints.ai_flags = AI_NUMERICHOST;
29
- if (getaddrinfo("127.0.0.1", 0, &hints, &ai) < 0) {
40
- if (pai->ai_family != AF_INET) {
41
- /* 127.0.0.1/NUMERICHOST should only resolve ONE way */
44
- if (pai->ai_addr->sa_family != AF_INET) {
45
- /* 127.0.0.1/NUMERICHOST should only resolve ONE way */
53
- ],ac_cv_func_getaddrinfo=yes, ac_cv_func_getaddrinfo=no, ac_cv_func_getaddrinfo=no),
54
-ac_cv_func_getaddrinfo=no)])
55
-if test "$ac_cv_func_getaddrinfo" = yes; then
56
+dnl AC_CACHE_CHECK([for getaddrinfo], ac_cv_func_getaddrinfo,
57
+dnl [AC_TRY_LINK([#include <netdb.h>],
58
+dnl [struct addrinfo *g,h;g=&h;getaddrinfo("","",g,&g);],
60
+dnl #include <netdb.h>
61
+dnl #include <sys/types.h>
63
+dnl # include <sys/socket.h>
66
+dnl struct addrinfo *ai, *pai, hints;
68
+dnl memset(&hints, 0, sizeof(hints));
69
+dnl hints.ai_flags = AI_NUMERICHOST;
71
+dnl if (getaddrinfo("127.0.0.1", 0, &hints, &ai) < 0) {
82
+dnl if (pai->ai_family != AF_INET) {
83
+dnl /* 127.0.0.1/NUMERICHOST should only resolve ONE way */
86
+dnl if (pai->ai_addr->sa_family != AF_INET) {
87
+dnl /* 127.0.0.1/NUMERICHOST should only resolve ONE way */
90
+dnl pai = pai->ai_next;
92
+dnl freeaddrinfo(ai);
95
+dnl ],ac_cv_func_getaddrinfo=yes, ac_cv_func_getaddrinfo=no, ac_cv_func_getaddrinfo=no),
96
+dnl ac_cv_func_getaddrinfo=no)])
97
+dnl if test "$ac_cv_func_getaddrinfo" = yes; then
98
AC_DEFINE(HAVE_GETADDRINFO,1,[Define if you have the getaddrinfo function])
102
AC_REPLACE_FUNCS(strlcat strlcpy getopt)