From b2c7eeaea70de991dcf4e0616332bc3df61eeaf3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Loyet?= Date: Fri, 9 Apr 2010 05:58:22 +0000 Subject: correct revision 297702 to make phpinfo output as text only when called from command line (-i switch), html otherwise --- sapi/fpm/fpm/fpm_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sapi/fpm/fpm/fpm_main.c b/sapi/fpm/fpm/fpm_main.c index 7fc363d467..2887a26228 100644 --- 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; -- cgit v1.2.1