Skip to content

Commit d9b766c

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

File tree

11 files changed

+3321
-3863
lines changed

11 files changed

+3321
-3863
lines changed

Zend/zend.c

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

443443
#ifdef ZTS
444-
static zend_bool asp_tags_default = 0;
445-
static zend_bool short_tags_default = 1;
444+
static zend_bool short_tags_default = 1;
446445
static uint32_t compiler_options_default = ZEND_COMPILE_DEFAULT;
447446
#else
448-
# define asp_tags_default 0
449447
# define short_tags_default 1
450448
# define compiler_options_default ZEND_COMPILE_DEFAULT
451449
#endif
452450

453451
static void zend_set_default_compile_time_values(TSRMLS_D) /* {{{ */
454452
{
455453
/* default compile-time values */
456-
CG(asp_tags) = asp_tags_default;
457454
CG(short_tags) = short_tags_default;
458455
CG(compiler_options) = compiler_options_default;
459456
}
@@ -777,7 +774,6 @@ void zend_post_startup(TSRMLS_D) /* {{{ */
777774
*GLOBAL_CLASS_TABLE = *compiler_globals->class_table;
778775
*GLOBAL_CONSTANTS_TABLE = *executor_globals->zend_constants;
779776

780-
asp_tags_default = CG(asp_tags);
781777
short_tags_default = CG(short_tags);
782778
compiler_options_default = CG(compiler_options);
783779

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)