diff options
| author | Ilia Alshanetsky <iliaa@php.net> | 2005-11-15 15:27:26 +0000 |
|---|---|---|
| committer | Ilia Alshanetsky <iliaa@php.net> | 2005-11-15 15:27:26 +0000 |
| commit | 57e49322a53cf7c1246f28b2f996fdd9a1ebd388 (patch) | |
| tree | 4c9d33b8201b5862103ad87c1e56d23b18a25ea8 /sapi/cli/php_cli.c | |
| parent | c4da6009bb1611851f85e9c9ff546c5b1a8a8104 (diff) | |
| download | php-git-57e49322a53cf7c1246f28b2f996fdd9a1ebd388.tar.gz | |
Fixed memory leak on php-cli -h
Diffstat (limited to 'sapi/cli/php_cli.c')
| -rw-r--r-- | sapi/cli/php_cli.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/sapi/cli/php_cli.c b/sapi/cli/php_cli.c index dcecdb111a..d5cde26c02 100644 --- a/sapi/cli/php_cli.c +++ b/sapi/cli/php_cli.c @@ -693,14 +693,13 @@ int main(int argc, char *argv[]) case 'h': /* help & quit */ case '?': - php_output_startup(); - php_output_activate(TSRMLS_C); + if (php_request_startup(TSRMLS_C)==FAILURE) { + goto err; + } 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 */ if (php_request_startup(TSRMLS_C)==FAILURE) { |