MFH: Fixed bug #29607 (highlighting code with HEREDOC produces invalid

output).

diff --git a/Zend/zend_highlight.c b/Zend/zend_highlight.c
index da74069b5521edebf9d11a3cd6ba94a5ba316da4..dbd0fcc75d81a2a81e64da85c9422349ac59673f 100644 (file)
--- a/Zend/zend_highlight.c
+++ b/Zend/zend_highlight.c
@@ -159,6 +159,12 @@ ZEND_API void zend_highlight(zend_syntax_highlighter_ini *syntax_highlighter_ini
                switch (token_type) {
                        case T_END_HEREDOC:
                                zend_html_puts(token.value.str.val, token.value.str.len TSRMLS_CC);
+                               {
+                                       char *ptr = LANG_SCNG(yy_text);
+                                       if (ptr[LANG_SCNG(yy_leng) - 1] != ';') {
+                                               zend_html_putc('\n');
+                                       }
+                               }
                                break;
                        default:
                                zend_html_puts(LANG_SCNG(yy_text), LANG_SCNG(yy_leng) TSRMLS_CC);