diff options
| author | Christoph M. Becker <cmbecker69@gmx.de> | 2020-06-01 13:25:58 +0200 |
|---|---|---|
| committer | Christoph M. Becker <cmbecker69@gmx.de> | 2020-06-01 13:25:58 +0200 |
| commit | 520a403fcd74b31d37808e370a4958d0a5e151ff (patch) | |
| tree | 6c3258c1a37e27bf7f561b3fdbbf53613b3acc52 /sapi/cli/php_cli.c | |
| parent | b0613d16d7e52d462a1ecb69da5ba88e74d4b0a6 (diff) | |
| parent | b26ad33001cf9612fde9c7506bf6856f63b8845c (diff) | |
| download | php-git-520a403fcd74b31d37808e370a4958d0a5e151ff.tar.gz | |
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix #79650: php-win.exe 100% cpu lockup
Diffstat (limited to 'sapi/cli/php_cli.c')
| -rw-r--r-- | sapi/cli/php_cli.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sapi/cli/php_cli.c b/sapi/cli/php_cli.c index a5fafda4f1..d068952343 100644 --- a/sapi/cli/php_cli.c +++ b/sapi/cli/php_cli.c @@ -260,6 +260,9 @@ PHP_CLI_API ssize_t sapi_cli_single_write(const char *str, size_t str_length) /* } while (ret <= 0 && errno == EAGAIN && sapi_cli_select(STDOUT_FILENO)); #else ret = fwrite(str, 1, MIN(str_length, 16384), stdout); + if (ret == 0 && ferror(stdout)) { + return -1; + } #endif return ret; } |