Revert // </script> patch

Metabolix · Mar 7, 2005 · 118b7b5 · 118b7b5
1 parent 0c9610f
commit 118b7b5
Showing 1 changed file with 3 additions and 12 deletions.
diff --git a/Zend/zend_language_scanner.l b/Zend/zend_language_scanner.l
@@ -1433,11 +1433,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();
 }
 
@@ -1450,15 +1450,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 */
@@ -1507,7 +1498,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;