Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions NEWS
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,9 @@ SimpleXML:
. Fixed bug #55098 (SimpleXML iteration produces infinite loop). (nielsdos)
. Fix signature of simplexml_import_dom(). (nielsdos)

Sockets:
. Added multicast group support for ipv4 on FreeBSD. (jonathan@tangential.ca)

SNMP:
. Removed the deprecated inet_ntoa call support. (David Carlier)

Expand Down
3 changes: 2 additions & 1 deletion ext/sockets/multicast.h
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@
+----------------------------------------------------------------------+
*/

#if defined(MCAST_JOIN_GROUP) && !defined(__APPLE__)
// TODO using setsourcefilter api on freebsd to support both ipv4/ipv6.
#if defined(MCAST_JOIN_GROUP) && !defined(__APPLE__) && !defined(__FreeBSD__)
# define RFC3678_API 1
/* has block/unblock and source membership, in this case for both IPv4 and IPv6 */
# define HAS_MCAST_EXT 1
Expand Down
7 changes: 0 additions & 7 deletions ext/sockets/tests/bug63000.phpt
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,6 @@
Bug #63000: Multicast on OSX
--EXTENSIONS--
sockets
--SKIPIF--
<?php

if (str_contains(PHP_OS, 'FreeBSD')) {
die('skip option not supported on FreeBSD');
}
?>
--FILE--
<?php
$socket = socket_create(AF_INET, SOCK_DGRAM, SOL_UDP);
Expand Down