diff options
| author | Xinchen Hui <laruence@php.net> | 2015-02-13 13:18:14 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@php.net> | 2015-02-13 13:28:24 +0800 |
| commit | da7d94cd73a1f654bf49b16b5d1bf221255710de (patch) | |
| tree | 7b7741213cb2f7ed9d8b687596ab41aa73b32c9a /Zend/zend_compile.c | |
| parent | 5e7fd50376a3f44bd01ef1041fa0a251317c358c (diff) | |
| parent | adc42657922be5da0e7fe5ac53027c6c4960ae3e (diff) | |
| download | php-git-da7d94cd73a1f654bf49b16b5d1bf221255710de.tar.gz | |
Merge branch 'PHP-5.6'
Conflicts:
ext/soap/soap.c
ext/standard/basic_functions.c
ext/zlib/zlib.c
Diffstat (limited to 'Zend/zend_compile.c')
| -rw-r--r-- | Zend/zend_compile.c | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index 90c7ec34b3..c9b67021f0 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -1229,6 +1229,7 @@ static zend_bool zend_try_ct_eval_class_const(zval *zv, zend_string *class_name, return 0; } +/* }}} */ void zend_init_list(void *result, void *item) /* {{{ */ { @@ -1309,6 +1310,19 @@ void zend_do_extended_fcall_end(void) /* {{{ */ } /* }}} */ +zend_bool zend_is_auto_global_str(char *name, size_t len) /* {{{ */ { + zend_auto_global *auto_global; + + if ((auto_global = zend_hash_str_find_ptr(CG(auto_globals), name, len)) != NULL) { + if (auto_global->armed) { + auto_global->armed = auto_global->auto_global_callback(auto_global->name); + } + return 1; + } + return 0; +} +/* }}} */ + zend_bool zend_is_auto_global(zend_string *name) /* {{{ */ { zend_auto_global *auto_global; |