Skip to content

Commit cc5925b

Browse files
committed
Remove <% and <script language="php"> tags
Removes: * <% opening tag * %> closing tag * <%= short opening tag * /<script\s+language\s*=\s*(php|"php"|'php')\s*>/i opening tag * /</script>/i closing tag * asp_tags ini directive
1 parent 06103d6 commit cc5925b

File tree

11 files changed

+3324
-3865
lines changed

11 files changed

+3324
-3865
lines changed

Zend/zend.c

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -372,19 +372,16 @@ static FILE *zend_fopen_wrapper(const char *filename, char **opened_path TSRMLS_
372372
/* }}} */
373373

374374
#ifdef ZTS
375-
static zend_bool asp_tags_default = 0;
376-
static zend_bool short_tags_default = 1;
375+
static zend_bool short_tags_default = 1;
377376
static uint32_t compiler_options_default = ZEND_COMPILE_DEFAULT;
378377
#else
379-
# define asp_tags_default 0
380378
# define short_tags_default 1
381379
# define compiler_options_default ZEND_COMPILE_DEFAULT
382380
#endif
383381

384382
static void zend_set_default_compile_time_values(TSRMLS_D) /* {{{ */
385383
{
386384
/* default compile-time values */
387-
CG(asp_tags) = asp_tags_default;
388385
CG(short_tags) = short_tags_default;
389386
CG(compiler_options) = compiler_options_default;
390387
}
@@ -721,7 +718,6 @@ void zend_post_startup(TSRMLS_D) /* {{{ */
721718
*GLOBAL_CLASS_TABLE = *compiler_globals->class_table;
722719
*GLOBAL_CONSTANTS_TABLE = *executor_globals->zend_constants;
723720

724-
asp_tags_default = CG(asp_tags);
725721
short_tags_default = CG(short_tags);
726722
compiler_options_default = CG(compiler_options);
727723

Zend/zend_globals.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,6 @@ struct _zend_compiler_globals {
9191
zend_bool parse_error;
9292
zend_bool in_compilation;
9393
zend_bool short_tags;
94-
zend_bool asp_tags;
9594

9695
zend_declarables declarables;
9796

0 commit comments

Comments
 (0)