Merge branch 'PHP-8.1' into PHP-8.2

* PHP-8.1:
  Fix interrupted CLI output causing the process to exit
This commit is contained in:
nielsdos 2023-06-23 17:42:32 +02:00
commit b9bf9ee2cb
2 changed files with 4 additions and 1 deletions

View file

@ -263,7 +263,7 @@ PHP_CLI_API ssize_t sapi_cli_single_write(const char *str, size_t str_length) /*
#ifdef PHP_WRITE_STDOUT
do {
ret = write(STDOUT_FILENO, str, str_length);
} while (ret <= 0 && errno == EAGAIN && sapi_cli_select(STDOUT_FILENO));
} while (ret <= 0 && (errno == EINTR || (errno == EAGAIN && sapi_cli_select(STDOUT_FILENO))));
#else
ret = fwrite(str, 1, MIN(str_length, 16384), stdout);
if (ret == 0 && ferror(stdout)) {