Merge branch 'PHP-7.4'

* PHP-7.4:
  Relax overly strict test expectation

diff --cc sapi/cli/tests/sapi_windows_set_ctrl_handler.phpt
Simple merge