Fixed bug #29606 (php_strip_whitespace() prints to stdout rather then

returning the value).

diff --git a/Zend/zend_highlight.c b/Zend/zend_highlight.c
index 757a4a12841913592250b3f1d71db2d124fb75d6..da74069b5521edebf9d11a3cd6ba94a5ba316da4 100644 (file)
--- a/Zend/zend_highlight.c
+++ b/Zend/zend_highlight.c
@@ -203,7 +203,7 @@ ZEND_API void zend_strip(TSRMLS_D)
                switch (token_type) {
                        case T_WHITESPACE:
                                if (!prev_space) {
-                                       putchar(' ');
+                                       zend_write(" ", sizeof(" ") - 1);
                                        prev_space = 1;
                                }
                                                /* lack of break; is intentional */
@@ -215,9 +215,9 @@ ZEND_API void zend_strip(TSRMLS_D)
                        case T_END_HEREDOC: {
                                        char *ptr = LANG_SCNG(yy_text);
 
-                                       fwrite(ptr, LANG_SCNG(yy_leng) - 1, 1, stdout);
+                                       zend_write(ptr, LANG_SCNG(yy_leng) - 1);
                                        /* The ensure that we only write one ; and that it followed by the required newline */
-                                       putchar('\n');
+                                       zend_write("\n", sizeof("\n") - 1);
                                        if (ptr[LANG_SCNG(yy_leng) - 1] == ';') {
                                                lex_scan(&token TSRMLS_CC);
                                        }
@@ -226,7 +226,7 @@ ZEND_API void zend_strip(TSRMLS_D)
                                break;
                        
                        default:
-                               fwrite(LANG_SCNG(yy_text), LANG_SCNG(yy_leng), 1, stdout);
+                               zend_write(LANG_SCNG(yy_text), LANG_SCNG(yy_leng));
                                break;
                }