Enable asp_tags/short_tags/allow_call_time_pass_by_reference to work on a per-directory

basis as well

diff --git a/Zend/zend.c b/Zend/zend.c
index f59762a6b19b6872f8c9fe0cb21e0bc5e7bea3db..9cdf8a8083aa02f007d4d4186344d279fab4bdf7 100644 (file)
--- a/Zend/zend.c
+++ b/Zend/zend.c
@@ -258,6 +258,11 @@ static void compiler_globals_ctor(zend_compiler_globals *compiler_globals)
        zend_hash_copy(compiler_globals->class_table, global_class_table, (copy_ctor_func_t) zend_class_add_ref, &tmp_class, sizeof(zend_class_entry));
 
        compiler_globals->extended_info = 0;
+
+       /* default compile-time values */
+       compiler_globals->asp_tags = 0;
+       compiler_globals->short_tags = 1;
+       compiler_globals->allow_call_time_pass_reference = 1;
 }
 
 

diff --git a/Zend/zend.h b/Zend/zend.h
index 2992afc038655ef34883287562d2d5e4c29d2806..e585ce585b39545164a5d18ad245fd79427625af 100644 (file)
--- a/Zend/zend.h
+++ b/Zend/zend.h
@@ -232,9 +232,6 @@ typedef struct _zend_utility_functions {
 
                
 typedef struct _zend_utility_values {
-       zend_bool short_tags;
-       zend_bool asp_tags;
-       zend_bool allow_call_time_pass_reference;
        char *import_use_extension;
        uint import_use_extension_length;
 } zend_utility_values;

diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c
index c60032c4274df2666b67275c1465e557c82299ca..557a0ea4bac6f0d12d8ef7ba332aa903c39dd590 100644 (file)
--- a/Zend/zend_compile.c
+++ b/Zend/zend_compile.c
@@ -90,9 +90,6 @@ void init_compiler(CLS_D ELS_DC)
        zend_llist_init(&CG(list_llist), sizeof(list_llist_element), NULL, 0);
        zend_llist_init(&CG(dimension_llist), sizeof(int), NULL, 0);
        zend_llist_init(&CG(filenames_list), sizeof(char *), free_filename, 0);
-       CG(short_tags) = ZEND_UV(short_tags);
-       CG(asp_tags) = ZEND_UV(asp_tags);
-       CG(allow_call_time_pass_reference) = ZEND_UV(allow_call_time_pass_reference);
        CG(handle_op_arrays) = 1;
        CG(in_compilation) = 0;
        zend_init_rsrc_list(ELS_C);