Skip to content

Commit d92c822

Browse files
committed
Revert "Avoid goto into zend_try block in do_cli()"
This reverts commit e5a723e. This fix was wrong, because we don't want to run the second try block when the first block bails. Given this can't happen in practice, let's just keep it the way it is.
1 parent e5a723e commit d92c822

File tree

1 file changed

+0
-2
lines changed

1 file changed

+0
-2
lines changed

sapi/cli/php_cli.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -867,10 +867,8 @@ static int do_cli(int argc, char **argv) /* {{{ */
867867
fprintf(stdout, "Executing for the first time...\n");
868868
fflush(stdout);
869869
}
870-
} zend_end_try();
871870

872871
do_repeat:
873-
zend_try {
874872
/* only set script_file if not set already and not in direct mode and not at end of parameter list */
875873
if (argc > php_optind
876874
&& !script_file

0 commit comments

Comments
 (0)