Skip to content

Commit ff23a34

Browse files
authored
define SO_ACCEPTFILTER separately where supported (#7146)
1 parent aee1daa commit ff23a34

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

ext/sockets/sockets.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -535,6 +535,8 @@ static PHP_MINIT_FUNCTION(sockets)
535535
REGISTER_LONG_CONSTANT("SO_LISTENQLIMIT", SO_LISTENQLIMIT, CONST_CS | CONST_PERSISTENT);
536536
REGISTER_LONG_CONSTANT("SO_LISTENQLEN", SO_LISTENQLEN, CONST_CS | CONST_PERSISTENT);
537537
REGISTER_LONG_CONSTANT("SO_USER_COOKIE", SO_USER_COOKIE, CONST_CS | CONST_PERSISTENT);
538+
#endif
539+
#ifdef SO_ACCEPTFILTER
538540
REGISTER_LONG_CONSTANT("SO_ACCEPTFILTER", SO_ACCEPTFILTER, CONST_CS | CONST_PERSISTENT);
539541
#endif
540542
REGISTER_LONG_CONSTANT("SOL_SOCKET", SOL_SOCKET, CONST_CS | CONST_PERSISTENT);

ext/sockets/tests/socket_set_option_acf.phpt

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,13 @@ Test if socket_set_option() works, option:SO_ACCEPTFILTER
33
--DESCRIPTION--
44
-wrong params
55
-set/get params comparison
6-
-l_linger not given
76
--EXTENSIONS--
87
sockets
98
--SKIPIF--
109
<?php
1110

12-
if (strpos(PHP_OS, 'FreeBSD') === false) {
13-
die('SKIP on non FreeBSD platforms');
11+
if (!defined("SO_ACCEPTFILTER")) {
12+
die('SKIP on platforms not supporting SO_ACCEPTFILTER');
1413
}
1514
?>
1615
--FILE--

0 commit comments

Comments
 (0)