sniper Sat Aug 27 21:03:00 2005 EDT
Modified files:
/php-src/ext/standard info.c
Log:
- Fixed bug #34284 (CLI phpinfo showing html on _SERVER["argv"])
http://cvs.php.net/diff.php/php-src/ext/standard/info.c?r1=1.254&r2=1.255&ty=u
Index: php-src/ext/standard/info.c
diff -u php-src/ext/standard/info.c:1.254 php-src/ext/standard/info.c:1.255
--- php-src/ext/standard/info.c:1.254 Tue Aug 23 08:53:24 2005
+++ php-src/ext/standard/info.c Sat Aug 27 21:02:54 2005
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: info.c,v 1.254 2005/08/23 12:53:24 dmitry Exp $ */
+/* $Id: info.c,v 1.255 2005/08/28 01:02:54 sniper Exp $ */
#include "php.h"
#include "php_ini.h"
@@ -151,14 +151,16 @@
php_ob_get_buffer(tmp3 TSRMLS_CC);
php_end_ob_buffer(0, 0 TSRMLS_CC);
- elem_esc = php_info_html_esc(Z_STRVAL_P(tmp3)
TSRMLS_CC);
- PUTS(elem_esc);
- efree(elem_esc);
- zval_ptr_dtor(&tmp3);
-
if (!sapi_module.phpinfo_as_text) {
+ elem_esc =
php_info_html_esc(Z_STRVAL_P(tmp3) TSRMLS_CC);
+ PUTS(elem_esc);
+ efree(elem_esc);
PUTS("</pre>");
+ } else {
+ PUTS(Z_STRVAL_P(tmp3));
}
+ zval_ptr_dtor(&tmp3);
+
} else if (Z_TYPE_PP(tmp) != IS_STRING) {
tmp2 = **tmp;
zval_copy_ctor(&tmp2);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
