Skip to content

Commit 118b7b5

Browse files
committed
Revert // </script> patch
1 parent 0c9610f commit 118b7b5

File tree

1 file changed

+3
-12
lines changed

1 file changed

+3
-12
lines changed

Zend/zend_language_scanner.l

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1433,11 +1433,11 @@ NEWLINE ("\r"|"\n"|"\r\n")
14331433
yymore();
14341434
}
14351435

1436-
<ST_ONE_LINE_COMMENT>"?"|"%"|">"|"<" {
1436+
<ST_ONE_LINE_COMMENT>"?"|"%"|">" {
14371437
yymore();
14381438
}
14391439

1440-
<ST_ONE_LINE_COMMENT>[^\n\r?%><]+ {
1440+
<ST_ONE_LINE_COMMENT>[^\n\r?%>]+ {
14411441
yymore();
14421442
}
14431443

@@ -1450,15 +1450,6 @@ NEWLINE ("\r"|"\n"|"\r\n")
14501450
return T_COMMENT;
14511451
}
14521452

1453-
<ST_ONE_LINE_COMMENT>"</script>" {
1454-
zendlval->value.str.val = yytext; /* no copying - intentional */
1455-
zendlval->value.str.len = yyleng;
1456-
zendlval->type = IS_STRING;
1457-
yyless(yyleng-9);
1458-
BEGIN(ST_IN_SCRIPTING);
1459-
return T_COMMENT;
1460-
}
1461-
14621453
<ST_ONE_LINE_COMMENT>"?>"|"%>" {
14631454
if (CG(asp_tags) || yytext[yyleng-2] != '%') { /* asp comment? */
14641455
zendlval->value.str.val = yytext; /* no copying - intentional */
@@ -1507,7 +1498,7 @@ NEWLINE ("\r"|"\n"|"\r\n")
15071498
yymore();
15081499
}
15091500

1510-
<ST_IN_SCRIPTING>("?>"|"</script>"){NEWLINE}? {
1501+
<ST_IN_SCRIPTING>("?>"|"</script"{WHITESPACE}*">"){NEWLINE}? {
15111502
zendlval->value.str.val = yytext; /* no copying - intentional */
15121503
zendlval->value.str.len = yyleng;
15131504
zendlval->type = IS_STRING;

0 commit comments

Comments
 (0)