fix leaks

diff --git a/sapi/cli/php_cli.c b/sapi/cli/php_cli.c
index 55a550c8f63b16ebf3e8412cad9a137fa4721bca..6d8aff915c04fe817f90399d63eb3cc3c0e82258 100644 (file)
--- a/sapi/cli/php_cli.c
+++ b/sapi/cli/php_cli.c
@@ -619,13 +619,14 @@ int main(int argc, char *argv[])
 
                        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 @@ int main(int argc, char *argv[])
                                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 @@ int main(int argc, char *argv[])
                                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) {