cvs: php-src(PHP_4_4) /sapi/cli php_cli.c

tony2001 Thu May 18 20:33:46 2006 UTC Modified files: (Branch: PHP_4_4) /php-src/sapi/cli php_cli.c Log: fix leaks http://cvs.php.net/viewcvs.cgi/php-src/sapi/cli/php_cli.c?r1=1.51.2.37.2.3&r2=1.51.2.37.2.4&diff_format=u Index: php-src/sapi/cli/php_cli.c diff -u php-src/sapi/cli/php_cli.c:1.51.2.37.2.3 php-src/sapi/cli/php_cli.c:1.51.2.37.2.4 --- php-src/sapi/cli/php_cli.c:1.51.2.37.2.3 Sun Jan 1 13:47:01 2006 +++ php-src/sapi/cli/php_cli.c Thu May 18 20:33:46 2006 @@ -619,13 +619,14 @@ case 'h': /* help & quit */ case '?': + if (php_request_startup(TSRMLS_C)==FAILURE) { + goto err; + } php_output_startup(); - php_output_activate(TSRMLS_C); php_cli_usage(argv[0]); php_end_ob_buffers(1 TSRMLS_CC); exit_status=0; - zend_ini_deactivate(TSRMLS_C); - goto out_err; + goto out; case 'i': /* php info & quit */ @@ -638,8 +639,10 @@ goto out; case 'm': /* list compiled in modules */ + if (php_request_startup(TSRMLS_C)==FAILURE) { + goto err; + } php_output_startup(); - php_output_activate(TSRMLS_C); php_printf("[PHP Modules]\n"); print_modules(TSRMLS_C); php_printf("\n[Zend Modules]\n"); @@ -647,8 +650,7 @@ php_printf("\n"); php_end_ob_buffers(1 TSRMLS_CC); exit_status=0; - zend_ini_deactivate(TSRMLS_C); - goto out_err; + goto out; case 'v': /* show php version & quit */ if (php_request_startup(TSRMLS_C)==FAILURE) {