fat Fri, 09 Apr 2010 05:58:22 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=297737
Log:
correct revision 297702 to make phpinfo output as text only when called from
command line (-i switch), html otherwise
Changed paths:
U php/php-src/branches/PHP_5_3_FPM/sapi/fpm/fpm/fpm_main.c
Modified: php/php-src/branches/PHP_5_3_FPM/sapi/fpm/fpm/fpm_main.c
===================================================================
--- php/php-src/branches/PHP_5_3_FPM/sapi/fpm/fpm/fpm_main.c 2010-04-09
05:11:24 UTC (rev 297736)
+++ php/php-src/branches/PHP_5_3_FPM/sapi/fpm/fpm/fpm_main.c 2010-04-09
05:58:22 UTC (rev 297737)
@@ -1550,7 +1550,6 @@
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 @@
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;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
