diff options
| author | foobar <sniper@php.net> | 2005-11-06 22:42:23 +0000 |
|---|---|---|
| committer | foobar <sniper@php.net> | 2005-11-06 22:42:23 +0000 |
| commit | 6ec23a56d81c8cb4a5e8ef4faab40fd678eae4d2 (patch) | |
| tree | 8532222451067e9669520d8758741c47cd72031f /sapi | |
| parent | 261eabbdd4287d583563c3e59ee4bf9720fb3c8b (diff) | |
| download | php-git-6ec23a56d81c8cb4a5e8ef4faab40fd678eae4d2.tar.gz | |
MFH:- Fixed minor leak with -dzlib.output_compression=1 -m
Diffstat (limited to 'sapi')
| -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 e3863a1e22..dcecdb111a 100644 --- a/sapi/cli/php_cli.c +++ b/sapi/cli/php_cli.c @@ -712,8 +712,9 @@ int main(int argc, char *argv[]) goto out; case 'm': /* list compiled in modules */ - php_output_startup(); - php_output_activate(TSRMLS_C); + if (php_request_startup(TSRMLS_C)==FAILURE) { + goto err; + } php_printf("[PHP Modules]\n"); print_modules(TSRMLS_C); php_printf("\n[Zend Modules]\n"); @@ -721,9 +722,7 @@ int main(int argc, char *argv[]) php_printf("\n"); php_end_ob_buffers(1 TSRMLS_CC); exit_status=0; - sapi_deactivate(TSRMLS_C); - zend_ini_deactivate(TSRMLS_C); - goto out_err; + goto out; case 'v': /* show php version & quit */ if (php_request_startup(TSRMLS_C)==FAILURE) { |