php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-01 13:12:16 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixed bug #39969 (ini setting short_open_tag has no effect when using --enable-maintainer-zts)

Browse Source
This commit is contained in:
Dmitry Stogov
2007-01-12 14:38:07 +00:00
parent 61b4b4b628
commit e5ea244b36
1 changed files with 18 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
Zend/zend.c
View File

@@ -666,12 +666,22 @@ static void register_standard_class(TSRMLS_D)
zend_hash_add(CG(class_table), "stdclass", sizeof("stdclass"), &zend_standard_class_def, sizeof(zend_class_entry *), NULL);
}
#ifdef ZTS
static zend_bool asp_tags_default = 0;
static zend_bool short_tags_default = 1;
static zend_bool extended_info_default = 0;
#else
# define asp_tags_default 0
# define short_tags_default 1
# define extended_info_default 0
#endif
static void zend_set_default_compile_time_values(TSRMLS_D)
{
/* default compile-time values */
CG(asp_tags) = 0;
CG(short_tags) = 1;
CG(extended_info) = 0;
CG(asp_tags) = asp_tags_default;
CG(short_tags) = short_tags_default;
CG(extended_info) = extended_info_default;
CG(literal_type) = ZEND_STR_TYPE;
}
@@ -1149,6 +1159,11 @@ void zend_post_startup(TSRMLS_D)
*GLOBAL_FUNCTION_TABLE = *compiler_globals->function_table;
*GLOBAL_CLASS_TABLE = *compiler_globals->class_table;
*GLOBAL_CONSTANTS_TABLE = *executor_globals->zend_constants;
asp_tags_default = CG(asp_tags);
short_tags_default = CG(short_tags);
extended_info_default = CG(extended_info);
zend_destroy_rsrc_list(&EG(persistent_list) TSRMLS_CC);
free(compiler_globals->function_table);
free(compiler_globals->class_table);