diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2018-03-11 16:37:08 +0100 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2018-03-11 16:37:08 +0100 |
| commit | bd2ecb01d2e5098cae8b13a80a2de31020e977c6 (patch) | |
| tree | 3388c65b49e324fc16287e1fa4929049899c63db | |
| parent | 8f8a6a3a490dc7c0ec0d8c7d984f75d055728e59 (diff) | |
| parent | 8489ecefd3de180d1944abfce2446a61d24ed3b3 (diff) | |
| download | php-git-bd2ecb01d2e5098cae8b13a80a2de31020e977c6.tar.gz | |
Merge branch 'PHP-7.2'
| -rw-r--r-- | ext/sockets/config.m4 | 13 | ||||
| -rw-r--r-- | ext/sockets/sockets.c | 2 |
2 files changed, 14 insertions, 1 deletions
diff --git a/ext/sockets/config.m4 b/ext/sockets/config.m4 index fe7d22a10a..2bf6a2bd11 100644 --- a/ext/sockets/config.m4 +++ b/ext/sockets/config.m4 @@ -69,6 +69,19 @@ if test "$PHP_SOCKETS" != "no"; then AC_DEFINE(HAVE_AI_ALL,1,[Whether you have AI_ALL]) fi + dnl Check for AI_IDN flag + AC_CACHE_CHECK([if getaddrinfo supports AI_IDN],[ac_cv_gai_ai_idn], + [ + AC_TRY_COMPILE([ +#include <netdb.h> + ], [int flag = AI_IDN;], + ac_cv_gai_ai_idn=yes, ac_cv_gai_ai_idn=no) + ]) + + if test "$ac_cv_gai_ai_idn" = yes; then + AC_DEFINE(HAVE_AI_IDN,1,[Whether you have AI_IDN]) + fi + PHP_NEW_EXTENSION([sockets], [sockets.c multicast.c conversions.c sockaddr_conv.c sendrecvmsg.c], [$ext_shared],, -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1) PHP_INSTALL_HEADERS([ext/sockets/], [php_sockets.h]) fi diff --git a/ext/sockets/sockets.c b/ext/sockets/sockets.c index 995466617d..b7f7489974 100644 --- a/ext/sockets/sockets.c +++ b/ext/sockets/sockets.c @@ -796,7 +796,7 @@ static PHP_MINIT_FUNCTION(sockets) REGISTER_LONG_CONSTANT("AI_ALL", AI_ALL, CONST_CS | CONST_PERSISTENT); #endif REGISTER_LONG_CONSTANT("AI_ADDRCONFIG", AI_ADDRCONFIG, CONST_CS | CONST_PERSISTENT); -#ifdef __USE_GNU +#if HAVE_AI_IDN REGISTER_LONG_CONSTANT("AI_IDN", AI_IDN, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT("AI_CANONIDN", AI_CANONIDN, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT("AI_IDN_ALLOW_UNASSIGNED", AI_IDN_ALLOW_UNASSIGNED, CONST_CS | CONST_PERSISTENT); |