[PHP-CVS] cvs: php-src /sapi/cgi cgi_main.c /sapi/cli php_cli.c

[Ilia Alshanetsky]

iliaa           Fri Aug  1 08:26:28 2003 EDT

  Modified files:              
    /php-src/sapi/cli   php_cli.c 
    /php-src/sapi/cgi   cgi_main.c 
  Log:
  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.95 php-src/sapi/cli/php_cli.c:1.96
--- php-src/sapi/cli/php_cli.c:1.95     Mon Jun 16 12:14:38 2003
+++ php-src/sapi/cli/php_cli.c  Fri Aug  1 08:26:28 2003
@@ -19,7 +19,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: php_cli.c,v 1.95 2003/06/16 16:14:38 stas Exp $ */
+/* $Id: php_cli.c,v 1.96 2003/08/01 12:26:28 iliaa Exp $ */
 
 #include "php.h"
 #include "php_globals.h"
@@ -1009,13 +1009,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.235 php-src/sapi/cgi/cgi_main.c:1.236
--- php-src/sapi/cgi/cgi_main.c:1.235   Sun Jun 29 16:45:38 2003
+++ php-src/sapi/cgi/cgi_main.c Fri Aug  1 08:26:28 2003
@@ -20,7 +20,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: cgi_main.c,v 1.235 2003/06/29 20:45:38 shane Exp $ */
+/* $Id: cgi_main.c,v 1.236 2003/08/01 12:26:28 iliaa Exp $ */
 
 #include "php.h"
 #include "php_globals.h"
@@ -1558,7 +1558,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;
@@ -1615,6 +1614,7 @@
                        }
 
                        php_request_shutdown((void *) 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