- Fixed bug #34284 (CLI phpinfo showing html on _SERVER["argv"])

diff --git a/ext/standard/info.c b/ext/standard/info.c
index 521fd6e1117cbb64c31dc54da7cbae2401084616..bc84619258c49fe44d6a8c1c9bfe12f139a8dcfa 100644 (file)
--- a/ext/standard/info.c
+++ b/ext/standard/info.c
@@ -151,14 +151,16 @@ static void php_print_gpcse_array(char *name, uint name_length TSRMLS_DC)
                                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);