iliaa Fri Aug 1 12:53:03 2003 EDT Modified files: (Branch: PHP_4_3) /php-src/sapi/cgi cgi_main.c /php-src/sapi/cli php_cli.c Log: MFH: Preserve exit status for non-php execution modes. Index: php-src/sapi/cgi/cgi_main.c diff -u php-src/sapi/cgi/cgi_main.c:1.190.2.41 php-src/sapi/cgi/cgi_main.c:1.190.2.42 --- php-src/sapi/cgi/cgi_main.c:1.190.2.41 Fri Aug 1 08:29:48 2003 +++ php-src/sapi/cgi/cgi_main.c Fri Aug 1 12:53:03 2003 @@ -20,7 +20,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: cgi_main.c,v 1.190.2.41 2003/08/01 12:29:48 iliaa Exp $ */ +/* $Id: cgi_main.c,v 1.190.2.42 2003/08/01 16:53:03 iliaa Exp $ */ #include "php.h" #include "php_globals.h" @@ -1540,7 +1540,6 @@ switch (behavior) { case PHP_MODE_STANDARD: php_execute_script(&file_handle TSRMLS_CC); - exit_status = EG(exit_status); break; case PHP_MODE_LINT: PG(during_request_startup) = 0; @@ -1597,7 +1596,9 @@ } php_request_shutdown((void *) 0); - exit_status = EG(exit_status); + if (exit_status == 0) { + exit_status = EG(exit_status); + } if (SG(request_info).path_translated) { free(SG(request_info).path_translated); Index: php-src/sapi/cli/php_cli.c diff -u php-src/sapi/cli/php_cli.c:1.51.2.26 php-src/sapi/cli/php_cli.c:1.51.2.27 --- php-src/sapi/cli/php_cli.c:1.51.2.26 Fri Aug 1 08:29:48 2003 +++ php-src/sapi/cli/php_cli.c Fri Aug 1 12:53:03 2003 @@ -869,7 +869,9 @@ out: php_request_shutdown((void *) 0); - exit_status = EG(exit_status); + if (exit_status == 0) { + exit_status = EG(exit_status); + } out_err: if (module_started) { php_module_shutdown(TSRMLS_C);
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php