MFB51: Fixed memory leak on php-cli -h

diff --git a/sapi/cli/php_cli.c b/sapi/cli/php_cli.c
index 7f971345ea78fb12f2e1cdf8eac75abc7bda6077..29f287bacce5e0c7ce50b5d8be19422bc8f981bc 100644 (file)
--- a/sapi/cli/php_cli.c
+++ b/sapi/cli/php_cli.c
@@ -700,14 +700,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) {