Skip to content

Commit 7e4c012

Browse files
committed
Merge branch 'PHP-5.4'
2 parents e200c7a + d1f0662 commit 7e4c012

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

sapi/cli/php_cli.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1167,15 +1167,15 @@ static int do_cli(int argc, char **argv TSRMLS_DC) /* {{{ */
11671167
} zend_end_try();
11681168

11691169
out:
1170-
if (exit_status == 0) {
1171-
exit_status = EG(exit_status);
1172-
}
11731170
if (request_started) {
11741171
php_request_shutdown((void *) 0);
11751172
}
11761173
if (translated_path) {
11771174
free(translated_path);
11781175
}
1176+
if (exit_status == 0) {
1177+
exit_status = EG(exit_status);
1178+
}
11791179
return exit_status;
11801180
err:
11811181
sapi_deactivate(TSRMLS_C);

0 commit comments

Comments
 (0)