1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103
|
Description: Always use getaddrinfo
.
The patch should probably be dropped and the configure check verified.
Origin: vendor
Forwarded: no
Last-Update: 2010-01-18
--- a/configure.in
+++ b/configure.in
@@ -615,50 +615,50 @@ PHP_CHECK_FUNC(nanosleep, rt)
dnl Check for getaddrinfo, should be a better way, but...
dnl Also check for working getaddrinfo
-AC_CACHE_CHECK([for getaddrinfo], ac_cv_func_getaddrinfo,
-[AC_TRY_LINK([#include <netdb.h>],
- [struct addrinfo *g,h;g=&h;getaddrinfo("","",g,&g);],
- AC_TRY_RUN([
-#include <netdb.h>
-#include <sys/types.h>
-#ifndef AF_INET
-# include <sys/socket.h>
-#endif
-int main(void) {
- struct addrinfo *ai, *pai, hints;
-
- memset(&hints, 0, sizeof(hints));
- hints.ai_flags = AI_NUMERICHOST;
-
- if (getaddrinfo("127.0.0.1", 0, &hints, &ai) < 0) {
- exit(1);
- }
-
- if (ai == 0) {
- exit(1);
- }
-
- pai = ai;
-
- while (pai) {
- if (pai->ai_family != AF_INET) {
- /* 127.0.0.1/NUMERICHOST should only resolve ONE way */
- exit(1);
- }
- if (pai->ai_addr->sa_family != AF_INET) {
- /* 127.0.0.1/NUMERICHOST should only resolve ONE way */
- exit(1);
- }
- pai = pai->ai_next;
- }
- freeaddrinfo(ai);
- exit(0);
-}
- ],ac_cv_func_getaddrinfo=yes, ac_cv_func_getaddrinfo=no, ac_cv_func_getaddrinfo=no),
-ac_cv_func_getaddrinfo=no)])
-if test "$ac_cv_func_getaddrinfo" = yes; then
+dnl AC_CACHE_CHECK([for getaddrinfo], ac_cv_func_getaddrinfo,
+dnl [AC_TRY_LINK([#include <netdb.h>],
+dnl [struct addrinfo *g,h;g=&h;getaddrinfo("","",g,&g);],
+dnl AC_TRY_RUN([
+dnl #include <netdb.h>
+dnl #include <sys/types.h>
+dnl #ifndef AF_INET
+dnl # include <sys/socket.h>
+dnl #endif
+dnl int main(void) {
+dnl struct addrinfo *ai, *pai, hints;
+dnl
+dnl memset(&hints, 0, sizeof(hints));
+dnl hints.ai_flags = AI_NUMERICHOST;
+dnl
+dnl if (getaddrinfo("127.0.0.1", 0, &hints, &ai) < 0) {
+dnl exit(1);
+dnl }
+dnl
+dnl if (ai == 0) {
+dnl exit(1);
+dnl }
+dnl
+dnl pai = ai;
+dnl
+dnl while (pai) {
+dnl if (pai->ai_family != AF_INET) {
+dnl /* 127.0.0.1/NUMERICHOST should only resolve ONE way */
+dnl exit(1);
+dnl }
+dnl if (pai->ai_addr->sa_family != AF_INET) {
+dnl /* 127.0.0.1/NUMERICHOST should only resolve ONE way */
+dnl exit(1);
+dnl }
+dnl pai = pai->ai_next;
+dnl }
+dnl freeaddrinfo(ai);
+dnl exit(0);
+dnl }
+dnl ],ac_cv_func_getaddrinfo=yes, ac_cv_func_getaddrinfo=no, ac_cv_func_getaddrinfo=no),
+dnl ac_cv_func_getaddrinfo=no)])
+dnl if test "$ac_cv_func_getaddrinfo" = yes; then
AC_DEFINE(HAVE_GETADDRINFO,1,[Define if you have the getaddrinfo function])
-fi
+dnl fi
AC_REPLACE_FUNCS(strlcat strlcpy getopt)
AC_FUNC_UTIME_NULL
|