iliaa Fri Aug 1 08:29:49 2003 EDT
Modified files: (Branch: PHP_4_3)
/php-src/sapi/cli php_cli.c
/php-src/sapi/cgi cgi_main.c
/php-src NEWS
Log:
MFH: Fixed bug #23509 (exit code lost when exit() called from
register_shutdown_function())
Index: php-src/sapi/cli/php_cli.c
diff -u php-src/sapi/cli/php_cli.c:1.51.2.25 php-src/sapi/cli/php_cli.c:1.51.2.26
--- php-src/sapi/cli/php_cli.c:1.51.2.25 Fri May 30 22:31:10 2003
+++ php-src/sapi/cli/php_cli.c Fri Aug 1 08:29:48 2003
@@ -865,13 +865,11 @@
if (cli_sapi_module.php_ini_path_override) {
free(cli_sapi_module.php_ini_path_override);
}
-
- } zend_catch {
- exit_status = EG(exit_status);
} zend_end_try();
out:
php_request_shutdown((void *) 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.190.2.40 php-src/sapi/cgi/cgi_main.c:1.190.2.41
--- php-src/sapi/cgi/cgi_main.c:1.190.2.40 Sun Jun 29 16:45:53 2003
+++ php-src/sapi/cgi/cgi_main.c Fri Aug 1 08:29:48 2003
@@ -20,7 +20,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: cgi_main.c,v 1.190.2.40 2003/06/29 20:45:53 shane Exp $ */
+/* $Id: cgi_main.c,v 1.190.2.41 2003/08/01 12:29:48 iliaa Exp $ */
#include "php.h"
#include "php_globals.h"
@@ -1597,6 +1597,7 @@
}
php_request_shutdown((void *) 0);
+ exit_status = EG(exit_status);
if (SG(request_info).path_translated) {
free(SG(request_info).path_translated);
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.318 php-src/NEWS:1.1247.2.319
--- php-src/NEWS:1.1247.2.318 Fri Aug 1 06:08:57 2003
+++ php-src/NEWS Fri Aug 1 08:29:48 2003
@@ -3,6 +3,8 @@
?? Aug 2003, Version 4.3.3RC3
- Fixed bug #24883 (variables_order and gpc_order being ignored). (Ilia)
- Fixed bug #24871 (methods misidentified as constructors). (Ilia)
+- Fixed bug #23509 (exit code lost when exit() called from
+ register_shutdown_function()). (Ilia)
- Fixed bug #22154 (Possible crash when memory_limit is reached and
output buffering in addition to session.use_trans_sid is used). (Ilia)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
