[prev in list] [next in list] [prev in thread] [next in thread] 

List:       php-cvs
Subject:    [PHP-CVS] com php-src: - Fixed bug #65923 (ext/socket assumes =?UTF-8?Q?AI=5FV=34MAPPED=20is=20defin
From:       Felipe Pena <felipe () php ! net>
Date:       2013-11-30 13:39:57
Message-ID: php-mail-f8321fa8205a21a1e389468d22eeef3a1101141769 () git ! php ! net
[Download RAW message or body]

Commit:    78f69a2b4f368058e9798c7ef1f733e783bfd220
Author:    Felipe Pena <felipensp@gmail.com>         Sat, 30 Nov 2013 11:39:57 -0200
Parents:   5f09944662e09ea0b3f93cfab8702f188955e68c
Branches:  master

Link:       http://git.php.net/?p=php-src.git;a=commitdiff;h=78f69a2b4f368058e9798c7ef1f733e783bfd220


Log:
- Fixed bug #65923 (ext/socket assumes AI_V4MAPPED is defined)

Bugs:
https://bugs.php.net/65923

Changed paths:
  M  ext/sockets/config.m4
  M  ext/sockets/sockaddr_conv.c


Diff:
diff --git a/ext/sockets/config.m4 b/ext/sockets/config.m4
index 9c75249..a5a63df 100644
--- a/ext/sockets/config.m4
+++ b/ext/sockets/config.m4
@@ -16,10 +16,10 @@ if test "$PHP_SOCKETS" != "no"; then
 
   if test "$ac_cv_cmsghdr" = yes; then
     AC_DEFINE(HAVE_CMSGHDR,1,[Whether you have struct cmsghdr])
-  fi 
+  fi
 
   AC_CHECK_FUNCS([hstrerror socketpair if_nametoindex if_indextoname])
-  AC_CHECK_HEADERS([netdb.h netinet/tcp.h sys/un.h sys/sockio.h errno.h]) 
+  AC_CHECK_HEADERS([netdb.h netinet/tcp.h sys/un.h sys/sockio.h errno.h])
   AC_TRY_COMPILE([
 #include <sys/types.h>
 #include <sys/socket.h>
@@ -27,7 +27,7 @@ if test "$PHP_SOCKETS" != "no"; then
     [AC_DEFINE(MISSING_MSGHDR_MSGFLAGS, 1, [ ])]
   )
   AC_DEFINE([HAVE_SOCKETS], 1, [ ])
-  
+
   dnl Check for fied ss_family in sockaddr_storage (missing in AIX until 5.3)
   AC_CACHE_CHECK([for field ss_family in struct sockaddr_storage], ac_cv_ss_family,
   [
@@ -38,11 +38,24 @@ if test "$PHP_SOCKETS" != "no"; then
   ], [struct sockaddr_storage sa_store; sa_store.ss_family = AF_INET6;],
      ac_cv_ss_family=yes, ac_cv_ss_family=no)
   ])
-  
+
   if test "$ac_cv_ss_family" = yes; then
     AC_DEFINE(HAVE_SA_SS_FAMILY,1,[Whether you have sockaddr_storage.ss_family])
   fi
 
+  dnl Check for AI_V4MAPPED flag
+  AC_CACHE_CHECK([if getaddrinfo supports AI_V4MAPPED],[ac_cv_gai_ai_v4mapped],
+  [
+    AC_TRY_COMPILE([
+#include <netdb.h>
+  ], [int flag = AI_V4MAPPED;],
+     ac_cv_gai_ai_v4mapped=yes, ac_cv_gai_ai_v4mapped=no)
+  ])
+
+  if test "$ac_cv_gai_ai_v4mapped" = yes; then
+    AC_DEFINE(HAVE_AI_V4MAPPED,1,[Whether you have AI_V4MAPPED])
+  fi
+
   PHP_NEW_EXTENSION([sockets], [sockets.c multicast.c conversions.c sockaddr_conv.c \
sendrecvmsg.c], [$ext_shared])  PHP_INSTALL_HEADERS([ext/sockets/], [php_sockets.h])
 fi
diff --git a/ext/sockets/sockaddr_conv.c b/ext/sockets/sockaddr_conv.c
index 64523c3..bc1131a 100644
--- a/ext/sockets/sockaddr_conv.c
+++ b/ext/sockets/sockaddr_conv.c
@@ -27,7 +27,11 @@ int php_set_inet6_addr(struct sockaddr_in6 *sin6, char *string, \
php_socket *php_  
 		memset(&hints, 0, sizeof(struct addrinfo));
 		hints.ai_family = AF_INET6;
+#if HAVE_AI_V4MAPPED
 		hints.ai_flags = AI_V4MAPPED | AI_ADDRCONFIG;
+#else
+		hints.ai_flags = AI_ADDRCONFIG;
+#endif
 		getaddrinfo(string, NULL, &hints, &addrinfo);
 		if (!addrinfo) {
 #ifdef PHP_WIN32


--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php


[prev in list] [next in list] [prev in thread] [next in thread]