diff options
| author | Christoph M. Becker <cmbecker69@gmx.de> | 2020-07-29 12:47:41 +0200 |
|---|---|---|
| committer | Christoph M. Becker <cmbecker69@gmx.de> | 2020-07-29 12:47:41 +0200 |
| commit | 687e14ddc220195390a68ce6ea43b0f55bad4aff (patch) | |
| tree | 80d1a71819050e96d46a784af990ec781e4a28e3 | |
| parent | ae8dea0b10663aee9aea07c27e9c7ec8cd85ad81 (diff) | |
| parent | f8792443a2c4c69d58a62ad32f2cbc3948774f53 (diff) | |
| download | php-git-687e14ddc220195390a68ce6ea43b0f55bad4aff.tar.gz | |
Merge branch 'PHP-7.4'
* PHP-7.4:
Prevent test case from stalling
| -rw-r--r-- | sapi/cli/tests/sapi_windows_set_ctrl_handler.phpt | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sapi/cli/tests/sapi_windows_set_ctrl_handler.phpt b/sapi/cli/tests/sapi_windows_set_ctrl_handler.phpt index dbb02a00bd..09030c90f8 100644 --- a/sapi/cli/tests/sapi_windows_set_ctrl_handler.phpt +++ b/sapi/cli/tests/sapi_windows_set_ctrl_handler.phpt @@ -56,11 +56,13 @@ if ($is_child) { $status = proc_get_status($proc); if ($status["running"]) { echo "Child $child_pid didn't exit after ${max}us\n"; + foreach ($pipes as $pipe) { + fclose($pipe); + } + proc_terminate($proc); } else { echo "Child $child_pid exit with status ", $status["exitcode"], " after ${total}us\n"; } - - proc_close($proc); } function get_evt_name(int $evt) : ?string |