cvs: php4 /sapi/cli php_cli.c

helly Sat Apr 19 11:02:44 2003 EDT Modified files: /php4/sapi/cli php_cli.c Log: Fix more shutdown wierdness Index: php4/sapi/cli/php_cli.c diff -u php4/sapi/cli/php_cli.c:1.84 php4/sapi/cli/php_cli.c:1.85 --- php4/sapi/cli/php_cli.c:1.84 Sat Apr 19 10:41:31 2003 +++ php4/sapi/cli/php_cli.c Sat Apr 19 11:02:44 2003 @@ -19,7 +19,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_cli.c,v 1.84 2003/04/19 14:41:31 wez Exp $ */ +/* $Id: php_cli.c,v 1.85 2003/04/19 15:02:44 helly Exp $ */ #include "php.h" #include "php_globals.h" @@ -609,12 +609,14 @@ zend_uv.html_errors = 0; /* tell the engine we're in non-html mode */ CG(in_compilation) = 0; /* not initialized but needed for several options */ + EG(uninitialized_zval_ptr) = NULL; if (cli_sapi_module.php_ini_path_override && cli_sapi_module.php_ini_ignore) { SG(headers_sent) = 1; SG(request_info).no_headers = 1; PUTS("You cannot use both -n and -c switch. Use -h for help.\n"); - exit(1); + exit_status=1; + goto out_err; } while ((c = php_getopt(argc, argv, OPTIONS, &optarg, &optind, 0)) != -1) {