Support <?=

diff --git a/Zend/zend-scanner.l b/Zend/zend-scanner.l
index a9e6d2944ad8236090adc89c98369faf966e15e7..116dcf72a853cddf5c83d28d12a71088f4cf3e90 100644 (file)
--- a/Zend/zend-scanner.l
+++ b/Zend/zend-scanner.l
@@ -993,8 +993,9 @@ ESCAPED_AND_WHITESPACE [\n\t\r #'.:;,()|^&+-/*=%!~<>?@]+
 }
 
 
-<INITIAL>"<%=" {
-       if (CG(asp_tags)) {
+<INITIAL>"<%="|"<?=" {
+       if ((yytext[1]=='%' && CG(asp_tags))
+               || (yytext[1]=='?' && CG(short_tags))) {
                zendlval->value.str.val = yytext; /* no copying - intentional */
                zendlval->value.str.len = yyleng;
                zendlval->type = IS_STRING;