Merge branch 'PHP-7.4' into PHP-8.0

cmb69 · cmb69 · commit 0c0ecf0470e2 · 2021-07-12T23:12:19.000+02:00
* PHP-7.4:
  Fix #73226: --r[fcez] always return zero exit code
diff --git a/NEWS b/NEWS
@@ -15,6 +15,7 @@ PHP                                                                        NEWS
     (cmb)
   . Fixed bug #80173 (Using return value of zend_assign_to_variable() is not
     safe). (Nikita)
+  . Fixed bug #73226 (--r[fcez] always return zero exit code). (cmb)
 
 - Intl:
   . Fixed bug #72809 (Locale::lookup() wrong result with canonicalize option).
diff --git a/sapi/cli/php_cli.c b/sapi/cli/php_cli.c
@@ -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);
