diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2018-11-20 21:16:19 +0100 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2018-11-20 21:16:28 +0100 |
| commit | 7a0d3406f69cbca40d97a37755282dc463605110 (patch) | |
| tree | d949ff0de6823ee9079160fd5ad8122464abc8f1 | |
| parent | 7d766bd657635798ecc34eeb0c02c6b0130dc5bf (diff) | |
| parent | e672cd4385d5a72ca8a81677b8c894fdaacfce03 (diff) | |
| download | php-git-7a0d3406f69cbca40d97a37755282dc463605110.tar.gz | |
Merge branch 'PHP-7.2' into PHP-7.3
| -rw-r--r-- | NEWS | 4 | ||||
| -rw-r--r-- | ext/sockets/config.m4 | 10 |
2 files changed, 13 insertions, 1 deletions
@@ -2,6 +2,10 @@ PHP NEWS ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| ?? ??? ????, PHP 7.3.0 +- Sockets: + . Fixed bug #77136 (Unsupported IPV6_RECVPKTINFO constants on macOS). + (Mizunashi Mana) + 22 Nov 2018, PHP 7.3.0RC6 - CLI: diff --git a/ext/sockets/config.m4 b/ext/sockets/config.m4 index 277a3a1dcd..055e816c78 100644 --- a/ext/sockets/config.m4 +++ b/ext/sockets/config.m4 @@ -80,6 +80,14 @@ if test "$PHP_SOCKETS" != "no"; 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_SOCKETS_CFLAGS=-DZEND_ENABLE_STATIC_TSRMLS_CACHE=1 + case $host_alias in + *darwin*) PHP_SOCKETS_CFLAGS="$PHP_SOCKETS_CFLAGS -D__APPLE_USE_RFC_3542" + esac + PHP_NEW_EXTENSION( + [sockets], + [sockets.c multicast.c conversions.c sockaddr_conv.c sendrecvmsg.c], + [$ext_shared],, + $PHP_SOCKETS_CFLAGS) PHP_INSTALL_HEADERS([ext/sockets/], [php_sockets.h]) fi |