- MFH heredoc handling in -a mode

diff --git a/sapi/cli/php_cli_readline.c b/sapi/cli/php_cli_readline.c
index 6382b33d0fb6df56d9c9f52e0ca6292fb627bbf6..ccdf6bd8f85d9b0625e711b94ae4f39d9542da28 100644 (file)
--- a/sapi/cli/php_cli_readline.c
+++ b/sapi/cli/php_cli_readline.c
@@ -217,8 +217,11 @@ int cli_is_valid_code(char *code, int len, char **prompt TSRMLS_DC)
                                }
                                break;
                        case heredoc:
-                               if (code[i - (heredoc_len + 1)] == '\n' && !strncmp(code + i - heredoc_len, heredoc_tag, heredoc_len)) {
+                               if (code[i - (heredoc_len + 1)] == '\n' && !strncmp(code + i - heredoc_len, heredoc_tag, heredoc_len) && code[i] == '\n') {
                                        code_type = body;
+                               } else if (code[i - (heredoc_len + 2)] == '\n' && !strncmp(code + i - heredoc_len - 1, heredoc_tag, heredoc_len) && code[i-1] == ';' && code[i] == '\n') {
+                                       code_type = body;
+                                       valid_end = 1;
                                }
                                break;
                        case outside: