diff options
author | Johannes Schlüter <johannes@php.net> | 2005-10-06 20:29:41 +0000 |
---|---|---|
committer | Johannes Schlüter <johannes@php.net> | 2005-10-06 20:29:41 +0000 |
commit | d3dc0a39bc0779f5b9047d71596403d3d09628c7 (patch) | |
tree | 7da07d4bc66034c058c24029715be8db91c4d9bc /sapi/cli/php_cli.c | |
parent | e1791bedd5084754de2b32b45c144d3d8b6a3758 (diff) | |
download | php-git-d3dc0a39bc0779f5b9047d71596403d3d09628c7.tar.gz |
- MFH: Fix #34557 php -m exits with "error" 1
Diffstat (limited to 'sapi/cli/php_cli.c')
-rw-r--r-- | sapi/cli/php_cli.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/sapi/cli/php_cli.c b/sapi/cli/php_cli.c index 1767b9c940..6cefbf303c 100644 --- a/sapi/cli/php_cli.c +++ b/sapi/cli/php_cli.c @@ -697,8 +697,9 @@ int main(int argc, char *argv[]) php_output_activate(TSRMLS_C); php_cli_usage(argv[0]); php_end_ob_buffers(1 TSRMLS_CC); - exit_status=1; - goto err; + exit_status=0; + zend_ini_deactivate(TSRMLS_C); + goto out_err; case 'i': /* php info & quit */ @@ -707,7 +708,7 @@ int main(int argc, char *argv[]) } php_print_info(0xFFFFFFFF TSRMLS_CC); php_end_ob_buffers(1 TSRMLS_CC); - exit_status=1; + exit_status=0; goto out; case 'm': /* list compiled in modules */ @@ -719,8 +720,9 @@ int main(int argc, char *argv[]) print_extensions(TSRMLS_C); php_printf("\n"); php_end_ob_buffers(1 TSRMLS_CC); - exit_status=1; - goto err; + exit_status=0; + zend_ini_deactivate(TSRMLS_C); + goto out_err; case 'v': /* show php version & quit */ if (php_request_startup(TSRMLS_C)==FAILURE) { @@ -732,7 +734,7 @@ int main(int argc, char *argv[]) php_printf("PHP %s (%s) (built: %s %s)\nCopyright (c) 1997-2005 The PHP Group\n%s", PHP_VERSION, sapi_module.name, __DATE__, __TIME__, get_zend_version()); #endif php_end_ob_buffers(1 TSRMLS_CC); - exit_status=1; + exit_status=0; goto out; default: |