Skip to content

Commit b26ad33

Browse files
committed
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3: Fix #79650: php-win.exe 100% cpu lockup
2 parents 8068fad + 923c45b commit b26ad33

File tree

2 files changed

+4
-0
lines changed

2 files changed

+4
-0
lines changed

NEWS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ PHP NEWS
44

55
- Core:
66
. Fixed bug #79595 (zend_init_fpu() alters FPU precision). (cmb, Nikita)
7+
. Fixed bug #79650 (php-win.exe 100% cpu lockup). (cmb)
78

89
- phpdbg:
910
. Fixed bug #73926 (phpdbg will not accept input on restart execution). (cmb)

sapi/cli/php_cli.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -266,6 +266,9 @@ PHP_CLI_API ssize_t sapi_cli_single_write(const char *str, size_t str_length) /*
266266
} while (ret <= 0 && errno == EAGAIN && sapi_cli_select(STDOUT_FILENO));
267267
#else
268268
ret = fwrite(str, 1, MIN(str_length, 16384), stdout);
269+
if (ret == 0 && ferror(stdout)) {
270+
return -1;
271+
}
269272
#endif
270273
return ret;
271274
}

0 commit comments

Comments
 (0)