iliaa Tue Nov 15 10:27:30 2005 EDT
Modified files: (Branch: PHP_5_1)
/php-src/sapi/cli php_cli.c
Log:
Fixed memory leak on php-cli -h
http://cvs.php.net/diff.php/php-src/sapi/cli/php_cli.c?r1=1.129.2.4&r2=1.129.2.5&ty=u
Index: php-src/sapi/cli/php_cli.c
diff -u php-src/sapi/cli/php_cli.c:1.129.2.4
php-src/sapi/cli/php_cli.c:1.129.2.5
--- php-src/sapi/cli/php_cli.c:1.129.2.4 Sun Nov 6 17:42:23 2005
+++ php-src/sapi/cli/php_cli.c Tue Nov 15 10:27:26 2005
@@ -20,7 +20,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_cli.c,v 1.129.2.4 2005/11/06 22:42:23 sniper Exp $ */
+/* $Id: php_cli.c,v 1.129.2.5 2005/11/15 15:27:26 iliaa Exp $ */
#include "php.h"
#include "php_globals.h"
@@ -693,14 +693,13 @@
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) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
