Index: sapi/cli/php_cli.c
===================================================================
RCS file: /repository/php-src/sapi/cli/php_cli.c,v
retrieving revision 1.51.2.37.2.3
diff -u -p -d -r1.51.2.37.2.3 php_cli.c
--- sapi/cli/php_cli.c	1 Jan 2006 13:47:01 -0000	1.51.2.37.2.3
+++ sapi/cli/php_cli.c	18 May 2006 20:28:57 -0000
@@ -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) {