Merge branch 'PHP-7.4' into PHP-8.0

* PHP-7.4:
  Fix #73226: --r[fcez] always return zero exit code
This commit is contained in:
Christoph M. Becker 2021-07-12 23:11:06 +02:00
commit 0c0ecf0470
No known key found for this signature in database
GPG key ID: D66C9593118BCCB6
2 changed files with 2 additions and 0 deletions

View file

@ -1064,6 +1064,7 @@ static int do_cli(int argc, char **argv) /* {{{ */
zend_printf("Exception: %s\n", Z_STRVAL_P(msg));
zend_object_release(EG(exception));
EG(exception) = NULL;
exit_status = 1;
} else {
zend_print_zval(&ref, 0);
zend_write("\n", 1);