iliaa Fri Aug 1 12:52:49 2003 EDT Modified files: /php-src/sapi/cli php_cli.c /php-src/sapi/cgi cgi_main.c Log: Preserve exit status for non-php execution modes. Index: php-src/sapi/cli/php_cli.c diff -u php-src/sapi/cli/php_cli.c:1.96 php-src/sapi/cli/php_cli.c:1.97 --- php-src/sapi/cli/php_cli.c:1.96 Fri Aug 1 08:26:28 2003 +++ php-src/sapi/cli/php_cli.c Fri Aug 1 12:52:49 2003 @@ -19,7 +19,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_cli.c,v 1.96 2003/08/01 12:26:28 iliaa Exp $ */ +/* $Id: php_cli.c,v 1.97 2003/08/01 16:52:49 iliaa Exp $ */ #include "php.h" #include "php_globals.h" @@ -1013,7 +1013,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); Index: php-src/sapi/cgi/cgi_main.c diff -u php-src/sapi/cgi/cgi_main.c:1.236 php-src/sapi/cgi/cgi_main.c:1.237 --- php-src/sapi/cgi/cgi_main.c:1.236 Fri Aug 1 08:26:28 2003 +++ php-src/sapi/cgi/cgi_main.c Fri Aug 1 12:52:49 2003 @@ -20,7 +20,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: cgi_main.c,v 1.236 2003/08/01 12:26:28 iliaa Exp $ */ +/* $Id: cgi_main.c,v 1.237 2003/08/01 16:52:49 iliaa Exp $ */ #include "php.h" #include "php_globals.h" @@ -1614,7 +1614,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);
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php