correct revision 297702 to make phpinfo output as text only when called from command line (-i switch), html otherwise

Jérôme Loyet · Jérôme Loyet · commit b2c7eeaea70d · 2010-04-09T05:58:22.000Z
diff --git a/sapi/fpm/fpm/fpm_main.c b/sapi/fpm/fpm/fpm_main.c
@@ -1550,7 +1550,6 @@ int main(int argc, char *argv[])
 
 	sapi_startup(&cgi_sapi_module);
 	cgi_sapi_module.php_ini_path_override = NULL;
-	cgi_sapi_module.phpinfo_as_text = 1;
 
 #ifdef PHP_WIN32
 	_fmode = _O_BINARY; /* sets default for file streams to binary */
@@ -1624,6 +1623,7 @@ int main(int argc, char *argv[])
 				goto out;
 
 			case 'i': /* php info & quit */
+				cgi_sapi_module.phpinfo_as_text = 1;
 				cgi_sapi_module.startup(&cgi_sapi_module);
 				if (php_request_startup(TSRMLS_C) == FAILURE) {
 					SG(server_context) = NULL;
