Merge branch 'PHP-7.4'

* PHP-7.4:
  Fix #79650: php-win.exe 100% cpu lockup
This commit is contained in:
Christoph M. Becker 2020-06-01 13:25:58 +02:00
commit 520a403fcd

View file

@ -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;
}