From: Zeev Suraski <zeev@php.net>
Date: Mon, 7 Mar 2005 16:48:12 +0000 (+0000)
Subject: Revert // </script> patch
X-Git-Tag: php-5.0.4RC1~61
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ba31cb7b88c196b463353ba8fc2ea3d74fcf2162;p=php

Revert // </script> patch
---

diff --git a/Zend/zend_language_scanner.l b/Zend/zend_language_scanner.l
index 91cd66dc0f..d6f17a2111 100644
--- 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;