sniper Sun Nov 6 17:41:51 2005 EDT
Modified files:
/php-src/sapi/cli php_cli.c
Log:
- Fixed minor memory leak triggered by: -dzlib.output_compression=1 -m
http://cvs.php.net/diff.php/php-src/sapi/cli/php_cli.c?r1=1.133&r2=1.134&ty=u
Index: php-src/sapi/cli/php_cli.c
diff -u php-src/sapi/cli/php_cli.c:1.133 php-src/sapi/cli/php_cli.c:1.134
--- php-src/sapi/cli/php_cli.c:1.133 Wed Oct 19 17:57:35 2005
+++ php-src/sapi/cli/php_cli.c Sun Nov 6 17:41:51 2005
@@ -20,7 +20,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_cli.c,v 1.133 2005/10/19 21:57:35 iliaa Exp $ */
+/* $Id: php_cli.c,v 1.134 2005/11/06 22:41:51 sniper Exp $ */
#include "php.h"
#include "php_globals.h"
@@ -719,8 +719,9 @@
goto out;
case 'm': /* list compiled in modules */
- php_output_startup();
- php_output_activate(TSRMLS_C);
+ if (php_request_startup(TSRMLS_C)==FAILURE) {
+ goto err;
+ }
php_printf("[PHP Modules]\n");
print_modules(TSRMLS_C);
php_printf("\n[Zend Modules]\n");
@@ -728,19 +729,24 @@
php_printf("\n");
php_end_ob_buffers(1 TSRMLS_CC);
exit_status=0;
- sapi_deactivate(TSRMLS_C);
- zend_ini_deactivate(TSRMLS_C);
- goto out_err;
+ goto out;
case 'v': /* show php version & quit */
- if (php_request_startup(TSRMLS_C)==FAILURE) {
+ if (php_request_startup(TSRMLS_C) == FAILURE) {
goto err;
}
-#if ZEND_DEBUG
- php_printf("PHP %s (%s) (built: %s %s)
(DEBUG)\nCopyright (c) 1997-2005 The PHP Group\n%s", PHP_VERSION,
sapi_module.name, __DATE__, __TIME__, get_zend_version());
-#else
- 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());
+
+ php_printf("PHP %s (%s) (built: %s %s)
%s\nCopyright (c) 1997-2005 The PHP Group\n%s",
+ PHP_VERSION, sapi_module.name,
__DATE__, __TIME__,
+#if ZEND_DEBUG && defined(HAVE_GCOV)
+ "(DEBUG GCOV)",
+#elif ZEND_DEBUG
+ "(DEBUG)",
+#elif defined(HAVE_GCOV)
+ "(GCOV)",
#endif
+ get_zend_version()
+ );
php_end_ob_buffers(1 TSRMLS_CC);
exit_status=0;
goto out;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
