Skip to content

Commit 3713c02

Browse files
committed
sapi/fpm: retiring solaris /dev/poll support proposal.
Since Solaris 10, the port API is supported, is more modern, less bug prone and offers, on average, better performances. Close GH-14685
1 parent 9435f4d commit 3713c02

File tree

6 files changed

+3
-301
lines changed

6 files changed

+3
-301
lines changed

UPGRADING

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -374,6 +374,9 @@ PHP 8.4 UPGRADE NOTES
374374
. Support for EOL Apache 2.0 and 2.2 has been removed. Minimum required Apache
375375
version is now 2.4.
376376

377+
- FPM:
378+
. /dev/poll events.mechanism setting for Solaris/Illumos had been retired.
379+
377380
========================================
378381
4. Deprecated Functionality
379382
========================================

sapi/fpm/config.m4

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -278,29 +278,6 @@ AS_VAR_IF([php_cv_have_kqueue], [yes],
278278
[Define to 1 if system has a working 'kqueue' function.])])
279279
])
280280

281-
AC_DEFUN([PHP_FPM_DEVPOLL],
282-
[AC_CACHE_CHECK([for /dev/poll],
283-
[php_cv_have_devpoll],
284-
[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([dnl
285-
#include <stdio.h>
286-
#include <sys/devpoll.h>
287-
], [dnl
288-
int n, dp;
289-
struct dvpoll dvp;
290-
dp = 0;
291-
dvp.dp_fds = NULL;
292-
dvp.dp_nfds = 0;
293-
dvp.dp_timeout = 0;
294-
n = ioctl(dp, DP_POLL, &dvp);
295-
(void)n;
296-
])],
297-
[php_cv_have_devpoll=yes],
298-
[php_cv_have_devpoll=no])])
299-
AS_VAR_IF([php_cv_have_devpoll], [yes],
300-
[AC_DEFINE([HAVE_DEVPOLL], [1],
301-
[Define to 1 if system has a working '/dev/poll'.])])
302-
])
303-
304281
AC_DEFUN([PHP_FPM_EPOLL],
305282
[AC_CACHE_CHECK([for epoll],
306283
[php_cv_have_epoll],
@@ -563,7 +540,6 @@ if test "$PHP_FPM" != "no"; then
563540
fpm/events/poll.c \
564541
fpm/events/epoll.c \
565542
fpm/events/kqueue.c \
566-
fpm/events/devpoll.c \
567543
fpm/events/port.c \
568544
"
569545

sapi/fpm/fpm/events/devpoll.c

Lines changed: 0 additions & 242 deletions
This file was deleted.

sapi/fpm/fpm/events/devpoll.h

Lines changed: 0 additions & 25 deletions
This file was deleted.

sapi/fpm/fpm/fpm_events.c

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
#include "events/select.h"
2424
#include "events/poll.h"
2525
#include "events/epoll.h"
26-
#include "events/devpoll.h"
2726
#include "events/port.h"
2827
#include "events/kqueue.h"
2928

@@ -279,14 +278,6 @@ int fpm_event_pre_init(char *mechanism) /* {{{ */
279278
}
280279
}
281280

282-
/* /dev/poll */
283-
module = fpm_event_devpoll_module();
284-
if (module) {
285-
if (!mechanism || strcasecmp(module->name, mechanism) == 0) {
286-
return 0;
287-
}
288-
}
289-
290281
/* poll */
291282
module = fpm_event_poll_module();
292283
if (module) {

sapi/fpm/php-fpm.conf.in

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,6 @@
112112
; - poll (any POSIX os)
113113
; - epoll (linux >= 2.5.44)
114114
; - kqueue (FreeBSD >= 4.1, OpenBSD >= 2.9, NetBSD >= 2.0)
115-
; - /dev/poll (Solaris >= 7)
116115
; - port (Solaris >= 10)
117116
; Default Value: not set (auto detection)
118117
;events.mechanism = epoll

0 commit comments

Comments
 (0)