diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2014-07-24 01:54:21 +0400 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2014-07-24 01:54:21 +0400 |
| commit | 7c6477ce37974f5d41cbbf245c27a2d0e6df1f6a (patch) | |
| tree | eb2c417726ae631e60fd04a4ed23719cb2358c2c /Zend/zend_constants.c | |
| parent | 9583a14e7586a78b3756996e67c9590989a691f2 (diff) | |
| parent | 8fb7c4dc08c9d4eeb891be47b63b5b717bb61c45 (diff) | |
| download | php-git-7c6477ce37974f5d41cbbf245c27a2d0e6df1f6a.tar.gz | |
Merge branch 'master' into phpng
* master:
Removed second zval_copy_ctor()
Fixed crash on self-referencing constant expression (part of a constant AST)
Fixed support for constant arrays in context of "const" statement (Zend/tests/constant_expressions_arrays.phpt failed when opcache.protect_memort was set)
Conflicts:
Zend/zend_ast.c
Zend/zend_vm_def.h
Zend/zend_vm_execute.h
ext/reflection/php_reflection.c
Diffstat (limited to 'Zend/zend_constants.c')
0 files changed, 0 insertions, 0 deletions