sniper Sat Aug 27 21:03:42 2005 EDT
Modified files: (Branch: PHP_5_1)
/php-src/ext/standard info.c
/php-src NEWS
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.249.2.3&r2=1.249.2.4&ty=u
Index: php-src/ext/standard/info.c
diff -u php-src/ext/standard/info.c:1.249.2.3
php-src/ext/standard/info.c:1.249.2.4
--- php-src/ext/standard/info.c:1.249.2.3 Mon Aug 15 20:25:39 2005
+++ php-src/ext/standard/info.c Sat Aug 27 21:03:41 2005
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: info.c,v 1.249.2.3 2005/08/16 00:25:39 iliaa Exp $ */
+/* $Id: info.c,v 1.249.2.4 2005/08/28 01:03:41 sniper Exp $ */
#include "php.h"
#include "php_ini.h"
@@ -149,14 +149,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);
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.2027.2.26&r2=1.2027.2.27&ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.26 php-src/NEWS:1.2027.2.27
--- php-src/NEWS:1.2027.2.26 Sat Aug 27 20:46:33 2005
+++ php-src/NEWS Sat Aug 27 21:03:41 2005
@@ -15,6 +15,7 @@
- Fixed "make test" to work for phpized extensions. (Hartmut, Jani)
- Fixed failing queries (FALSE returned) with mysqli_query() on 64 bit systems.
(Andrey)
+- Fixed bug #34284 (CLI phpinfo showing html on _SERVER["argv"]). (Jani)
- Fixed bug #34257 (lib64 not handled correctly in ming extension). (Marcus)
- Fixed bug #34221 (Compiling xmlrpc as shared fails other parts). (Jani)
- Fixed bug #34191 (ob_gzhandler does not enforce trailing \0). (Ilia)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
