summaryrefslogtreecommitdiff
path: root/sapi/cli/php_cli.c
diff options
context:
space:
mode:
authorNikita Popov <nikita.ppv@gmail.com>2019-08-23 17:01:49 +0200
committerNikita Popov <nikita.ppv@gmail.com>2019-08-23 17:01:49 +0200
commit51ea7fc4775bad00f332c0c8b0c54be7c60ab2ed (patch)
tree2b2674384fbc5bd7b5011cf5695546c6700788a3 /sapi/cli/php_cli.c
parent51905cd2126d8f1523de01a4b5cbdb4f161758c0 (diff)
parent8807889ac280503d5cd1cd05804a6f278a40300e (diff)
downloadphp-git-51ea7fc4775bad00f332c0c8b0c54be7c60ab2ed.tar.gz
Merge branch 'PHP-7.4'
Diffstat (limited to 'sapi/cli/php_cli.c')
-rw-r--r--sapi/cli/php_cli.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/sapi/cli/php_cli.c b/sapi/cli/php_cli.c
index 2b0fb71fcc..834a9a0161 100644
--- a/sapi/cli/php_cli.c
+++ b/sapi/cli/php_cli.c
@@ -236,19 +236,18 @@ static void print_extensions(void) /* {{{ */
static inline int sapi_cli_select(php_socket_t fd)
{
- fd_set wfd, dfd;
+ fd_set wfd;
struct timeval tv;
int ret;
FD_ZERO(&wfd);
- FD_ZERO(&dfd);
PHP_SAFE_FD_SET(fd, &wfd);
tv.tv_sec = (long)FG(default_socket_timeout);
tv.tv_usec = 0;
- ret = php_select(fd+1, &dfd, &wfd, &dfd, &tv);
+ ret = php_select(fd+1, NULL, &wfd, NULL, &tv);
return ret != -1;
}