Fixed memory leak on php-cli -h
authorIlia Alshanetsky <iliaa@php.net>
Tue, 15 Nov 2005 15:27:26 +0000 (15:27 +0000)
committerIlia Alshanetsky <iliaa@php.net>
Tue, 15 Nov 2005 15:27:26 +0000 (15:27 +0000)
sapi/cli/php_cli.c

index dcecdb111a454faf2d3f44ad58d0538cc8987d41..d5cde26c02e8de2e9b9d2a362c417680bbce7757 100644 (file)
@@ -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) {