[php-src] poll-cleanup: io: Use php_pollfd_for_ms for single fd poll

Author: Calvin Buckley (NattyNarwhal)
Date: 2026-07-24T01:57:47-03:00

Commit: https://github.com/php/php-src/commit/0c67aa2e50a75d1430d7297044d3a4344219f3d0
Raw diff: https://github.com/php/php-src/commit/0c67aa2e50a75d1430d7297044d3a4344219f3d0.diff

io: Use php_pollfd_for_ms for single fd poll

Changed paths:
  M  main/io/php_io.c
  M  main/io/php_io_copy_linux.c


Diff:

diff --git a/main/io/php_io.c b/main/io/php_io.c
index bd45ec888790..6954cd4bfde5 100644
--- a/main/io/php_io.c
+++ b/main/io/php_io.c
@@ -23,7 +23,6 @@
 #include <winsock2.h>
 #else
 #include <unistd.h>
-#include <poll.h>
 #endif
 
 static php_io php_io_instance = {
@@ -106,13 +105,9 @@ static int php_io_generic_wait_for_data(php_io_fd *fd)
 		? -1
 		: (int) (fd->timeout.tv_sec * 1000 + fd->timeout.tv_usec / 1000);
 
-	struct pollfd pfd;
-	pfd.fd = fd->fd;
-	pfd.events = POLLIN;
-
 	int ret;
 	do {
-		ret = poll(&pfd, 1, timeout_ms);
+		ret = php_pollfd_for_ms(fd->fd, POLLIN, timeout_ms);
 	} while (ret == -1 && errno == EINTR);
 
 	return ret;
diff --git a/main/io/php_io_copy_linux.c b/main/io/php_io_copy_linux.c
index 9a1810349d3d..af92b14a64d3 100644
--- a/main/io/php_io_copy_linux.c
+++ b/main/io/php_io_copy_linux.c
@@ -54,13 +54,9 @@ static inline int php_io_linux_wait_for_data(php_io_fd *fd)
 		timeout_ms = ptimeout->tv_sec * 1000 + ptimeout->tv_usec / 1000;
 	}
 
-	struct pollfd pfd;
-	pfd.fd = fd->fd;
-	pfd.events = POLLIN;
-
 	int ret;
 	do {
-		ret = poll(&pfd, 1, timeout_ms);
+		ret = php_pollfd_for_ms(fd->fd, POLLIN, timeout_ms);
 	} while (ret == -1 && errno == EINTR);
 
 	return ret;