Skip to content

Commit 0c0ecf0

Browse files
committed
Merge branch 'PHP-7.4' into PHP-8.0
* PHP-7.4: Fix #73226: --r[fcez] always return zero exit code
2 parents 5fb5a73 + 9db3eda commit 0c0ecf0

File tree

2 files changed

+2
-0
lines changed

2 files changed

+2
-0
lines changed

NEWS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ PHP NEWS
1515
(cmb)
1616
. Fixed bug #80173 (Using return value of zend_assign_to_variable() is not
1717
safe). (Nikita)
18+
. Fixed bug #73226 (--r[fcez] always return zero exit code). (cmb)
1819

1920
- Intl:
2021
. Fixed bug #72809 (Locale::lookup() wrong result with canonicalize option).

sapi/cli/php_cli.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1064,6 +1064,7 @@ static int do_cli(int argc, char **argv) /* {{{ */
10641064
zend_printf("Exception: %s\n", Z_STRVAL_P(msg));
10651065
zend_object_release(EG(exception));
10661066
EG(exception) = NULL;
1067+
exit_status = 1;
10671068
} else {
10681069
zend_print_zval(&ref, 0);
10691070
zend_write("\n", 1);

0 commit comments

Comments
 (0)