diff options
| author | Jérôme Loyet <fat@php.net> | 2010-04-09 05:58:22 +0000 |
|---|---|---|
| committer | Jérôme Loyet <fat@php.net> | 2010-04-09 05:58:22 +0000 |
| commit | b2c7eeaea70de991dcf4e0616332bc3df61eeaf3 (patch) | |
| tree | 6cee4fe5a8dfad0ed9ad4fb7494ce7c8576e4826 | |
| parent | d9e16972f32b6efcd4737d3c34ad79f683f756e1 (diff) | |
| download | php-git-experimental/5.3-FPM.tar.gz | |
correct revision 297702 to make phpinfo output as text only when called from command line (-i switch), html otherwiseexperimental/5.3-FPM
| -rw-r--r-- | sapi/fpm/fpm/fpm_main.c | 2 |
1 files changed, 1 insertions, 1 deletions
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; |