Revert // </script> patch

diff --git a/Zend/zend_language_scanner.l b/Zend/zend_language_scanner.l
index 91cd66dc0f944d32507dbf1bfd00fa0aefe303eb..d6f17a211189d5402b3266d64e03dfe133682fda 100644 (file)
--- a/Zend/zend_language_scanner.l
+++ b/Zend/zend_language_scanner.l
@@ -1432,11 +1432,11 @@ NEWLINE ("\r"|"\n"|"\r\n")
        yymore();
 }
 
-<ST_ONE_LINE_COMMENT>"?"|"%"|">"|"<" {
+<ST_ONE_LINE_COMMENT>"?"|"%"|">" {
        yymore();
 }
 
-<ST_ONE_LINE_COMMENT>[^\n\r?%><]+ {
+<ST_ONE_LINE_COMMENT>[^\n\r?%>]+ {
        yymore();
 }
 
@@ -1449,15 +1449,6 @@ NEWLINE ("\r"|"\n"|"\r\n")
        return T_COMMENT;
 }
 
-<ST_ONE_LINE_COMMENT>"</script>" {
-       zendlval->value.str.val = yytext; /* no copying - intentional */
-       zendlval->value.str.len = yyleng;
-       zendlval->type = IS_STRING;
-       yyless(yyleng-9);
-       BEGIN(ST_IN_SCRIPTING);
-       return T_COMMENT;
-}
-
 <ST_ONE_LINE_COMMENT>"?>"|"%>" {
     if (CG(asp_tags) || yytext[yyleng-2] != '%') { /* asp comment? */
                zendlval->value.str.val = yytext; /* no copying - intentional */
@@ -1506,7 +1497,7 @@ NEWLINE ("\r"|"\n"|"\r\n")
        yymore();
 }
 
-<ST_IN_SCRIPTING>("?>"|"</script>"){NEWLINE}? {
+<ST_IN_SCRIPTING>("?>"|"</script"{WHITESPACE}*">"){NEWLINE}? {
        zendlval->value.str.val = yytext; /* no copying - intentional */
        zendlval->value.str.len = yyleng;
        zendlval->type = IS_STRING;