Skip to content

Commit 7326a68

Browse files
committed
Remove PHP Short tags from language scanner and globals
1 parent 4b249af commit 7326a68

File tree

2 files changed

+1
-15
lines changed

2 files changed

+1
-15
lines changed

Zend/zend_globals.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,6 @@ struct _zend_compiler_globals {
8383

8484
zend_bool parse_error;
8585
zend_bool in_compilation;
86-
zend_bool short_tags;
8786

8887
zend_bool unclean_shutdown;
8988

Zend/zend_language_scanner.l

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1947,19 +1947,6 @@ string:
19471947
RETURN_TOKEN(T_OPEN_TAG);
19481948
}
19491949

1950-
1951-
<INITIAL>"<?" {
1952-
if (CG(short_tags)) {
1953-
BEGIN(ST_IN_SCRIPTING);
1954-
if (PARSER_MODE()) {
1955-
SKIP_TOKEN(T_OPEN_TAG);
1956-
}
1957-
RETURN_TOKEN(T_OPEN_TAG);
1958-
} else {
1959-
goto inline_char_handler;
1960-
}
1961-
}
1962-
19631950
<INITIAL>{ANY_CHAR} {
19641951
if (YYCURSOR > YYLIMIT) {
19651952
RETURN_TOKEN(END);
@@ -1977,7 +1964,7 @@ inline_char_handler:
19771964
}
19781965

19791966
if (*YYCURSOR == '?') {
1980-
if (CG(short_tags) || !strncasecmp((char*)YYCURSOR + 1, "php", 3) || (*(YYCURSOR + 1) == '=')) { /* Assume [ \t\n\r] follows "php" */
1967+
if (!strncasecmp((char*)YYCURSOR + 1, "php", 3) || (*(YYCURSOR + 1) == '=')) { /* Assume [ \t\n\r] follows "php" */
19811968

19821969
YYCURSOR--;
19831970
break;

0 commit comments

Comments
 (0)